From 15184c039c2d9c1b4b6c498721d057d93a75e264 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Wed, 11 Mar 2020 20:42:00 +0100
Subject: [PATCH] improve autostart and fix some typos

---
 handlers/main.yml                    | 7 +++++++
 tasks/configure_weechat.yml          | 2 +-
 tasks/install-debian.yml             | 2 +-
 tasks/main.yml                       | 2 +-
 tasks/setup_autostart.yml            | 9 ++++++---
 {files => templates}/weechat.service | 1 +
 vars/main.yml                        | 2 +-
 7 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 handlers/main.yml
 rename {files => templates}/weechat.service (90%)

diff --git a/handlers/main.yml b/handlers/main.yml
new file mode 100644
index 0000000..847712f
--- /dev/null
+++ b/handlers/main.yml
@@ -0,0 +1,7 @@
+---
+- name: systemctl restart weechat.service
+  become: true
+  systemd:
+    state: restarted
+    name: weechat.service
+    daemon_reload: yes
diff --git a/tasks/configure_weechat.yml b/tasks/configure_weechat.yml
index a7905af..c56a7db 100644
--- a/tasks/configure_weechat.yml
+++ b/tasks/configure_weechat.yml
@@ -1,3 +1,3 @@
 ---
 - include_tasks: configure_directorys.yml
-  when: configure_weechat | bool
+  when: weechat.configure | bool
diff --git a/tasks/install-debian.yml b/tasks/install-debian.yml
index d03592e..844a04a 100644
--- a/tasks/install-debian.yml
+++ b/tasks/install-debian.yml
@@ -29,6 +29,6 @@
      - weechat-python
      - weechat-perl
      - weechat-lua
-     - weechaz-ruby
+     - weechat-ruby
      - weechat-doc
     state: present
diff --git a/tasks/main.yml b/tasks/main.yml
index c2fa9ae..29de6ba 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,7 +10,7 @@
   when: weechat.install | bool
 
 - include_tasks: configure_weechat.yml
-  when: configure_weechat | bool
+  when: weechat.configure | bool
 
 - include_tasks: setup_autostart.yml
   when: weechat.autostart | bool
diff --git a/tasks/setup_autostart.yml b/tasks/setup_autostart.yml
index 4f82ff1..154bd78 100644
--- a/tasks/setup_autostart.yml
+++ b/tasks/setup_autostart.yml
@@ -8,16 +8,19 @@
 
 - name: copy systemd service for weechat
   become: true
-  copy:
-    src: files/weechat.service
+  template:
+    src: templates/weechat.service
     dest: /etc/systemd/system/weechat.service
     owner: root
     group: root
     mode: '0644'
+  notify: systemctl restart weechat.service
 
-- name: start and enable weechat.service
+- name: enable weechat.service
   become: true
   systemd:
+    enabled: true
     state: started
     name: weechat.service
     daemon_reload: yes
+  notify: systemctl restart weechat.service
diff --git a/files/weechat.service b/templates/weechat.service
similarity index 90%
rename from files/weechat.service
rename to templates/weechat.service
index b0658c0..ac59319 100644
--- a/files/weechat.service
+++ b/templates/weechat.service
@@ -2,6 +2,7 @@
 Description=Weechat Chat Client
 
 [Service]
+User={{ weechat.user }}
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/bin/tmux -2 new-session -d -s weechat /usr/bin/weechat
diff --git a/vars/main.yml b/vars/main.yml
index 8bce40a..b31ac08 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -9,7 +9,7 @@ weechat_plugin_languages:
   lua: lua
 
 # version management
-playbook_version_number: 2053 # should be over ninethousand
+playbook_version_number: 2054 # should be over ninethousand
 playbook_version_path: 'role-weechat_roles-ansible_github.com.version'
 
 # default values