From 95140f12eaa01b3788b3c4353514ebd47c6d4fb5 Mon Sep 17 00:00:00 2001 From: Tobias Hachmer Date: Mon, 5 Feb 2018 15:46:56 +0100 Subject: [PATCH] Role service-fastd: configure systemd service unit overrides instead of replacing the whole file --- roles/service-fastd/tasks/main.yml | 14 +++++++++++--- ...std@.service.j2 => fastd@_service_overrides.j2} | 6 ------ 2 files changed, 11 insertions(+), 9 deletions(-) rename roles/service-fastd/templates/{fastd@.service.j2 => fastd@_service_overrides.j2} (62%) diff --git a/roles/service-fastd/tasks/main.yml b/roles/service-fastd/tasks/main.yml index dcd65ad..94d7721 100644 --- a/roles/service-fastd/tasks/main.yml +++ b/roles/service-fastd/tasks/main.yml @@ -12,10 +12,18 @@ name: fastd masked: yes -- name: write systemd unit fastd@.service +- name: create systemd override dir for fastd@.service + file: + path: /etc/systemd/system/fastd@.service.d + state: directory + owner: root + group: root + mode: 0755 + +- name: configure systemd unit overrides template: - src: fastd@.service.j2 - dest: /etc/systemd/system/fastd@.service + src: fastd@_service_overrides.j2 + dest: /etc/systemd/system/fastd@.service.d/override.conf owner: root group: root mode: 0644 diff --git a/roles/service-fastd/templates/fastd@.service.j2 b/roles/service-fastd/templates/fastd@_service_overrides.j2 similarity index 62% rename from roles/service-fastd/templates/fastd@.service.j2 rename to roles/service-fastd/templates/fastd@_service_overrides.j2 index 47c30c1..782c6d7 100644 --- a/roles/service-fastd/templates/fastd@.service.j2 +++ b/roles/service-fastd/templates/fastd@_service_overrides.j2 @@ -1,11 +1,5 @@ [Unit] Description=Fast and Secure Tunnelling Daemon (connection %i) -After=network.target [Service] -Type=notify ExecStart=/usr/bin/fastd --syslog-level info --syslog-ident fastd@%i -c /etc/fastd/%i/fastd.conf -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target