aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--roles/linux_status/tasks/main.yml27
-rw-r--r--roles/systemd_edit/tasks/main.yml (renamed from roles/systemd_requires_mount/tasks/main.yml)9
-rw-r--r--roles/systemd_requires_mount_for/tasks/main.yml6
3 files changed, 16 insertions, 26 deletions
diff --git a/roles/linux_status/tasks/main.yml b/roles/linux_status/tasks/main.yml
index 6ce23f9..1383699 100644
--- a/roles/linux_status/tasks/main.yml
+++ b/roles/linux_status/tasks/main.yml
@@ -15,27 +15,10 @@
- name: Disable power management
when: linux_status_disable_power_management
- become: true
+ ansible.builtin.include_role:
+ name: systemd_edit
vars:
service_name: linux-status
- block:
- - name: 'Create override directory: {{ service_name }}'
- ansible.builtin.file:
- path: '/etc/systemd/system/{{ service_name }}.service.d'
- state: directory
-
- - name: 'Set up override: {{ service_name }}'
- community.general.ini_file:
- dest: '/etc/systemd/system/{{ service_name }}.service.d/override.conf'
- section: Unit
- option: ExecStart
- values: ['', '/usr/bin/python3 -B server.py --disable-power']
- no_extra_spaces: true
- register: overridden
-
- - name: 'Restart service: {{ service_name }}'
- ansible.builtin.systemd_service:
- daemon_reload: true
- name: '{{ service_name }}'
- state: restarted
- when: overridden.changed
+ service_section: Service
+ service_option: ExecStart
+ service_values: ['', '/usr/bin/python3 -B server.py --disable-power']
diff --git a/roles/systemd_requires_mount/tasks/main.yml b/roles/systemd_edit/tasks/main.yml
index cd4beb3..06a0a8a 100644
--- a/roles/systemd_requires_mount/tasks/main.yml
+++ b/roles/systemd_edit/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Set up systemd service dependency
+- name: Edit systemd service definition
become: true
block:
- name: 'Create override directory: {{ service_name }}'
@@ -9,9 +9,10 @@
- name: 'Set up override: {{ service_name }}'
community.general.ini_file:
dest: '/etc/systemd/system/{{ service_name }}.service.d/override.conf'
- section: Unit
- option: RequiresMountsFor
- value: '{{ mount_dir }}'
+ section: '{{ service_section }}'
+ option: '{{ service_option }}'
+ values: '{{ service_values }}'
+ no_extra_spaces: true
register: overridden
- name: 'Restart service: {{ service_name }}'
diff --git a/roles/systemd_requires_mount_for/tasks/main.yml b/roles/systemd_requires_mount_for/tasks/main.yml
new file mode 100644
index 0000000..71db6e4
--- /dev/null
+++ b/roles/systemd_requires_mount_for/tasks/main.yml
@@ -0,0 +1,6 @@
+- ansible.builtin.include_role:
+ name: systemd_edit
+ vars:
+ service_section: Unit
+ service_option: RequiresMountFor
+ service_values: ['{{ mount_dir }}']