diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2019-07-25 17:19:02 +0200 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2019-07-25 17:19:02 +0200 |
| commit | e419f141dc36f9b1a5a99a8f89d954af5905c423 (patch) | |
| tree | bab4242ac1eb3389821af79a97a7b26cb33cf0f3 /roles | |
| parent | 1114d8728212e0c62059507f8da307240a30fd88 (diff) | |
| download | playbooks-ansible-e419f141dc36f9b1a5a99a8f89d954af5905c423.tar.gz playbooks-ansible-e419f141dc36f9b1a5a99a8f89d954af5905c423.tar.xz playbooks-ansible-e419f141dc36f9b1a5a99a8f89d954af5905c423.zip | |
include statement is obsolete in systemd. replacing them with name.service.d directory
Update ownership of private key
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/proxy/files/squid.service | 1 | ||||
| -rw-r--r-- | roles/proxy/tasks/config.yml | 11 | ||||
| -rw-r--r-- | roles/torrelay/files/tor.service | 2 | ||||
| -rw-r--r-- | roles/torrelay/tasks/config.yml | 7 |
4 files changed, 14 insertions, 7 deletions
diff --git a/roles/proxy/files/squid.service b/roles/proxy/files/squid.service index d8c2316..dda8cc2 100644 --- a/roles/proxy/files/squid.service +++ b/roles/proxy/files/squid.service @@ -1,3 +1,2 @@ -.include /lib/systemd/system/squid.service [Unit] Requires=network-online.target diff --git a/roles/proxy/tasks/config.yml b/roles/proxy/tasks/config.yml index a933e00..596bc0b 100644 --- a/roles/proxy/tasks/config.yml +++ b/roles/proxy/tasks/config.yml @@ -7,10 +7,15 @@ mode: 0640 notify: restart squid -- name: Installation de l'unité systemd +- name: Création du répertoire pour unité systemd + file: + path: /etc/systemd/system/squid.service.d + state: directory + +- name: Installation unité systemd modifiée copy: src: squid.service - dest: /etc/systemd/system/ + dest: /etc/systemd/system/squid.service.d/custom.conf owner: root group: root mode: 0644 @@ -42,7 +47,7 @@ copy: src: "certs/{{ maindomain }}.{{ crtversion }}.key" dest: /etc/pki/tls/private/ - owner: 0990 + owner: 0984 group: root mode: 0440 register: keyupdate diff --git a/roles/torrelay/files/tor.service b/roles/torrelay/files/tor.service index 8c1f13f..24c6204 100644 --- a/roles/torrelay/files/tor.service +++ b/roles/torrelay/files/tor.service @@ -1,4 +1,2 @@ -.include /lib/systemd/system/tor.service - [Service] TimeoutSec=infinity diff --git a/roles/torrelay/tasks/config.yml b/roles/torrelay/tasks/config.yml index 5ad7849..337ebb0 100644 --- a/roles/torrelay/tasks/config.yml +++ b/roles/torrelay/tasks/config.yml @@ -1,7 +1,12 @@ +- name: Création du répertoire pour unité systemd + file: + path: /etc/systemd/system/tor.service.d + state: directory + - name: Réglage du timeout du service systemd copy: src: tor.service - dest: /etc/systemd/system/tor.service + dest: /etc/systemd/system/tor.service.d/custom.conf mode: 0644 when: ansible_distribution == "Fedora" notify: reload systemd |