/lib/systemd/system → /etc/systemd/system

17 files changed, 14 insertions, 14 deletions

diff --git a/roles/bacula-dir/files/lib/systemd/system/bacula-director.service b/roles/bacula-dir/files/etc/systemd/system/bacula-director.service
index 8f952c6..8f952c6 100644
--- a/roles/bacula-dir/files/lib/systemd/system/bacula-director.service
+++ b/roles/bacula-dir/files/etc/systemd/system/bacula-director.service
diff --git a/roles/bacula-dir/tasks/main.yml b/roles/bacula-dir/tasks/main.yml
index 30a25c1..5a23dc5 100644
--- a/roles/bacula-dir/tasks/main.yml
+++ b/roles/bacula-dir/tasks/main.yml
@@ -23,35 +23,35 @@
         state=file
         owner=bacula group=bacula
         mode=0600
 
 - name: Configure bconsole
   template: src=etc/bacula/bconsole.conf.j2
             dest=/etc/bacula/bconsole.conf
             owner=root group=root
             mode=0644
 
 - name: Configure bacula
   template: src=etc/bacula/bacula-dir.conf.j2
             dest=/etc/bacula/bacula-dir.conf
             owner=root group=root
             mode=0644
   register: r
   notify:
     - Restart bacula-director
 
 - name: Copy bacula-director.service
-  copy: src=lib/systemd/system/bacula-director.service
-        dest=/lib/systemd/system/bacula-director.service
+  copy: src=etc/systemd/system/bacula-director.service
+        dest=/etc/systemd/system/bacula-director.service
         owner=root group=root
         mode=0644
   notify:
     - systemctl daemon-reload
     - Restart bacula-director
 
 - meta: flush_handlers
 
 - name: Enable bacula-director
   service: name=bacula-director enabled=yes
 
 - name: Start bacula-director
   service: name=bacula-director state=started
diff --git a/roles/bacula-sd/files/lib/systemd/system/bacula-sd.service b/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
index 698ad17..698ad17 100644
--- a/roles/bacula-sd/files/lib/systemd/system/bacula-sd.service
+++ b/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
diff --git a/roles/bacula-sd/tasks/main.yml b/roles/bacula-sd/tasks/main.yml
index ad77db4..19ae2f3 100644
--- a/roles/bacula-sd/tasks/main.yml
+++ b/roles/bacula-sd/tasks/main.yml
@@ -1,42 +1,42 @@
 - name: Install bacula-sd
   apt: pkg=bacula-sd
 
 # Create with:
 #   echo $director-dir $(pwgen -sn 64 1) | sudo tee -a /etc/bacula/passwords-sd
 - name: Ensure /etc/bacula/passwords-sd exists
   file: path=/etc/bacula/passwords-sd
         state=file
         owner=bacula group=bacula
         mode=0600
 
 - name: Configure bacula
   template: src=etc/bacula/bacula-sd.conf.j2
             dest=/etc/bacula/bacula-sd.conf
             owner=root group=root
             mode=0644
   notify:
     - Restart bacula-sd
 
 - name: Copy bacula-sd.service
-  copy: src=lib/systemd/system/bacula-sd.service
-        dest=/lib/systemd/system/bacula-sd.service
+  copy: src=etc/systemd/system/bacula-sd.service
+        dest=/etc/systemd/system/bacula-sd.service
         owner=root group=root
         mode=0644
   notify:
     - systemctl daemon-reload
     - Restart bacula-sd
 
 - meta: flush_handlers
 
 - name: Enable bacula-sd
   service: name=bacula-sd enabled=yes
 
 - name: Start bacula-sd
   service: name=bacula-sd state=started
 
 # To avoid bacula creating archives under /mnt/backup/bacula when it's
 # not a mountpoint, use `chmod 0700 /mnt/backup; chown root:root /mnt/backup`
 # before mounting the disk.
 - name: Create /mnt/backup/bacula
   file: path=/mnt/backup/bacula
         state=directory
diff --git a/roles/common/files/lib/systemd/system/bacula-fd.service b/roles/common/files/etc/systemd/system/bacula-fd.service
index ee5afe3..ee5afe3 100644
--- a/roles/common/files/lib/systemd/system/bacula-fd.service
+++ b/roles/common/files/etc/systemd/system/bacula-fd.service
diff --git a/roles/common/files/lib/systemd/system/stunnel4.service b/roles/common/files/etc/systemd/system/stunnel4.service
index 990e07b..990e07b 100644
--- a/roles/common/files/lib/systemd/system/stunnel4.service
+++ b/roles/common/files/etc/systemd/system/stunnel4.service
diff --git a/roles/common/files/lib/systemd/system/stunnel4@.service b/roles/common/files/etc/systemd/system/stunnel4@.service
index e53d29e..e53d29e 100644
--- a/roles/common/files/lib/systemd/system/stunnel4@.service
+++ b/roles/common/files/etc/systemd/system/stunnel4@.service
diff --git a/roles/common/tasks/bacula.yml b/roles/common/tasks/bacula.yml
index 35666bd..73a2fa1 100644
--- a/roles/common/tasks/bacula.yml
+++ b/roles/common/tasks/bacula.yml
@@ -38,35 +38,35 @@
                          --privkey=/etc/bacula/ssl/{{ inventory_hostname_short }}.pem
                          --ou=BaculaFD --cn={{ inventory_hostname }} --dns={{ inventory_hostname }}
                          -t rsa -b 4096 -h sha512
   register: r
   changed_when: r.rc == 0
   failed_when: r.rc > 1
   notify:
     - Restart bacula-fd
   tags:
     - genkey
 
 - name: Copy the master public key for data encryption
   copy: src=certs/bacula/data-master.pem
         dest=/etc/bacula/ssl/master.pem
         owner=root group=root
         mode=0644
   tags:
     - genkey
 
 - name: Copy bacula-fd.service
-  copy: src=lib/systemd/system/bacula-fd.service
-        dest=/lib/systemd/system/bacula-fd.service
+  copy: src=etc/systemd/system/bacula-fd.service
+        dest=/etc/systemd/system/bacula-fd.service
         owner=root group=root
         mode=0644
   notify:
     - systemctl daemon-reload
     - Restart bacula-fd
 
 - meta: flush_handlers
 
 - name: Enable bacula-fd
   service: name=bacula-fd enabled=yes
 
 - name: Start bacula-fd
   service: name=bacula-fd state=started
diff --git a/roles/common/tasks/stunnel.yml b/roles/common/tasks/stunnel.yml
index 68469cd..7cb8823 100644
--- a/roles/common/tasks/stunnel.yml
+++ b/roles/common/tasks/stunnel.yml
@@ -1,20 +1,20 @@
 - name: Install stunnel4
   apt: pkg=stunnel4
 
 - name: Set 'ENABLED=0' in /etc/default/stunnel4
   lineinfile: dest=/etc/default/stunnel4
               regexp='^(\s*#)?\s*ENABLED='
               line='ENABLED=0'
               owner=root group=root
               mode=0644
 
 - name: Copy stunnel4 service file
-  copy: src=lib/systemd/system/{{ item }}
-        dest=/lib/systemd/system/{{ item }}
+  copy: src=etc/systemd/system/{{ item }}
+        dest=/etc/systemd/system/{{ item }}
         owner=root group=root
         mode=0644
   notify:
     - systemctl daemon-reload
   with_items:
     - stunnel4.service
     - stunnel4@.service
diff --git a/roles/lists/files/lib/systemd/system/wwsympa.service b/roles/lists/files/etc/systemd/system/wwsympa.service
index 4e3d94b..4e3d94b 100644
--- a/roles/lists/files/lib/systemd/system/wwsympa.service
+++ b/roles/lists/files/etc/systemd/system/wwsympa.service
diff --git a/roles/lists/files/lib/systemd/system/wwsympa.socket b/roles/lists/files/etc/systemd/system/wwsympa.socket
index 10fe721..10fe721 100644
--- a/roles/lists/files/lib/systemd/system/wwsympa.socket
+++ b/roles/lists/files/etc/systemd/system/wwsympa.socket
diff --git a/roles/lists/tasks/sympa.yml b/roles/lists/tasks/sympa.yml
index 981de8a..4aaa2c9 100644
--- a/roles/lists/tasks/sympa.yml
+++ b/roles/lists/tasks/sympa.yml
@@ -58,38 +58,38 @@
   template: src=etc/sympa/robot.conf.j2
             dest=/etc/sympa/{{ item }}/robot.conf
             owner=root group=root
             mode=0644
   with_items:
     - lists.fripost.org
   register: r4
   notify:
     - Restart Sympa
 
 - name: Enable Sympa
   service: name=sympa enabled=yes
 
 - name: Start Sympa
   service: name=sympa state=started
   when: not (r1.changed or r2.changed or r3.changed or r4.changed)
 
 - meta: flush_handlers
 
 - name: Copy wwsympa.{service,socket}
-  copy: src=lib/systemd/system/{{ item }}
-        dest=/lib/systemd/system/{{ item }}
+  copy: src=etc/systemd/system/{{ item }}
+        dest=/etc/systemd/system/{{ item }}
         owner=root group=root
         mode=0644
   notify:
     - systemctl daemon-reload
     - Restart wwsympa
   with_items:
     - wwsympa.service
     - wwsympa.socket
 
 - meta: flush_handlers
 
 - name: Enable WWSympa
   service: name=wwsympa enabled=yes
 
 - name: Start WWSympa
   service: name=wwsympa state=started
diff --git a/roles/munin-master/files/lib/systemd/system/munin-cgi-graph.service b/roles/munin-master/files/etc/systemd/system/munin-cgi-graph.service
index 60ab444..60ab444 100644
--- a/roles/munin-master/files/lib/systemd/system/munin-cgi-graph.service
+++ b/roles/munin-master/files/etc/systemd/system/munin-cgi-graph.service
diff --git a/roles/munin-master/files/lib/systemd/system/munin-cgi-graph.socket b/roles/munin-master/files/etc/systemd/system/munin-cgi-graph.socket
index d4d2e27..d4d2e27 100644
--- a/roles/munin-master/files/lib/systemd/system/munin-cgi-graph.socket
+++ b/roles/munin-master/files/etc/systemd/system/munin-cgi-graph.socket
diff --git a/roles/munin-master/files/lib/systemd/system/munin-cgi-html.service b/roles/munin-master/files/etc/systemd/system/munin-cgi-html.service
index 119d3a2..119d3a2 100644
--- a/roles/munin-master/files/lib/systemd/system/munin-cgi-html.service
+++ b/roles/munin-master/files/etc/systemd/system/munin-cgi-html.service
diff --git a/roles/munin-master/files/lib/systemd/system/munin-cgi-html.socket b/roles/munin-master/files/etc/systemd/system/munin-cgi-html.socket
index 77be2cf..77be2cf 100644
--- a/roles/munin-master/files/lib/systemd/system/munin-cgi-html.socket
+++ b/roles/munin-master/files/etc/systemd/system/munin-cgi-html.socket
diff --git a/roles/munin-master/tasks/main.yml b/roles/munin-master/tasks/main.yml
index bcdc509..8c7a6a6 100644
--- a/roles/munin-master/tasks/main.yml
+++ b/roles/munin-master/tasks/main.yml
@@ -26,54 +26,54 @@
         mode=0755
 
 - name: Configure munin
   template: src=etc/munin/munin.conf.j2
             dest=/etc/munin/munin.conf
             owner=root group=root
             mode=0644
   notify:
     - Restart munin-cgi-graph
     - Restart munin-cgi-html
 
 - name: chown www-data:adm /var/log/munin/munin-cgi-{graph,html}.log
   file: path=/var/log/munin/{{ item }}
         owner=www-data group=adm
         mode=0640
   with_items:
     - munin-cgi-graph.log
     - munin-cgi-html.log
 
 - name: Copy munin-cgi-graph.{service,socket}
-  copy: src=lib/systemd/system/{{ item }}
-        dest=/lib/systemd/system/{{ item }}
+  copy: src=etc/systemd/system/{{ item }}
+        dest=/etc/systemd/system/{{ item }}
         owner=root group=root
         mode=0644
   notify:
     - systemctl daemon-reload
     - Restart munin-cgi-graph
   with_items:
     - munin-cgi-graph.service
     - munin-cgi-graph.socket
 
 - name: Copy munin-cgi-html.{service,socket}
-  copy: src=lib/systemd/system/{{ item }}
-        dest=/lib/systemd/system/{{ item }}
+  copy: src=etc/systemd/system/{{ item }}
+        dest=/etc/systemd/system/{{ item }}
         owner=root group=root
         mode=0644
   notify:
     - systemctl daemon-reload
     - Restart munin-cgi-html
   with_items:
     - munin-cgi-html.service
     - munin-cgi-html.socket
 
 - meta: flush_handlers
 
 - name: Start munin-cgi-{graph,html}
   service: name={{ item }} state=started enabled=yes
   with_items:
     - munin-cgi-graph
     - munin-cgi-html
 
 
 - name: Copy /etc/nginx/sites-available/munin
   copy: src=etc/nginx/sites-available/munin