From 15f0f87d138381d2a26165332e6acf6211a030a7 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 8 Dec 2021 20:21:54 -0600 Subject: [PATCH] soft-code service unit name grep -rlZ 'name: nginx' . | xargs -0 sed -i 's/name: nginx/name: {{ systemd_unit_name }}/g' --- roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml | 2 +- roles/0-DEPRECATED-ROLES/elgg/tasks/nginx.yml | 2 +- roles/awstats/tasks/nginx.yml | 2 +- roles/calibre-web/tasks/enable-or-disable.yml | 2 +- roles/cups/tasks/nginx.yml | 2 +- roles/gitea/tasks/enable-or-disable.yml | 2 +- roles/internetarchive/tasks/enable-or-disable.yml | 2 +- roles/jupyterhub/tasks/enable-or-disable.yml | 2 +- roles/kiwix/tasks/nginx.yml | 2 +- roles/kolibri/tasks/enable-or-disable.yml | 2 +- roles/lokole/tasks/nginx.yml | 2 +- roles/mediawiki/tasks/nginx.yml | 2 +- roles/moodle/tasks/enable-or-disable.yml | 2 +- roles/munin/tasks/enable-or-disable.yml | 2 +- roles/nginx/tasks/enable-or-disable.yml | 4 ++-- roles/nginx/tasks/install.yml | 6 +++++- roles/nodered/tasks/enable-or-disable.yml | 2 +- roles/osm-vector-maps/tasks/nginx.yml | 2 +- roles/pbx/tasks/enable-or-disable.yml | 2 +- roles/sugarizer/tasks/enable-or-disable.yml | 2 +- roles/usb_lib/tasks/nginx.yml | 2 +- roles/wordpress/tasks/nginx.yml | 2 +- roles/www_options/tasks/main.yml | 2 +- vars/default_vars.yml | 1 + 24 files changed, 29 insertions(+), 24 deletions(-) diff --git a/roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml b/roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml index 094312866..0189bbaa6 100644 --- a/roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml +++ b/roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml @@ -30,7 +30,7 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted when: nginx_enabled diff --git a/roles/0-DEPRECATED-ROLES/elgg/tasks/nginx.yml b/roles/0-DEPRECATED-ROLES/elgg/tasks/nginx.yml index 3a4a302d1..5b36b4fc9 100644 --- a/roles/0-DEPRECATED-ROLES/elgg/tasks/nginx.yml +++ b/roles/0-DEPRECATED-ROLES/elgg/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/awstats/tasks/nginx.yml b/roles/awstats/tasks/nginx.yml index 810348fb0..35b36c5d9 100644 --- a/roles/awstats/tasks/nginx.yml +++ b/roles/awstats/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/calibre-web/tasks/enable-or-disable.yml b/roles/calibre-web/tasks/enable-or-disable.yml index b196176f9..f5388a672 100644 --- a/roles/calibre-web/tasks/enable-or-disable.yml +++ b/roles/calibre-web/tasks/enable-or-disable.yml @@ -31,5 +31,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/cups/tasks/nginx.yml b/roles/cups/tasks/nginx.yml index 886a15c14..13b618dd3 100644 --- a/roles/cups/tasks/nginx.yml +++ b/roles/cups/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/gitea/tasks/enable-or-disable.yml b/roles/gitea/tasks/enable-or-disable.yml index 3401c3fdd..2251cff37 100644 --- a/roles/gitea/tasks/enable-or-disable.yml +++ b/roles/gitea/tasks/enable-or-disable.yml @@ -28,5 +28,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/internetarchive/tasks/enable-or-disable.yml b/roles/internetarchive/tasks/enable-or-disable.yml index 47cebe214..c95b92a77 100644 --- a/roles/internetarchive/tasks/enable-or-disable.yml +++ b/roles/internetarchive/tasks/enable-or-disable.yml @@ -28,5 +28,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/jupyterhub/tasks/enable-or-disable.yml b/roles/jupyterhub/tasks/enable-or-disable.yml index b8a504589..bb4d32d3d 100644 --- a/roles/jupyterhub/tasks/enable-or-disable.yml +++ b/roles/jupyterhub/tasks/enable-or-disable.yml @@ -29,5 +29,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/kiwix/tasks/nginx.yml b/roles/kiwix/tasks/nginx.yml index 0fd9c674a..00452b924 100644 --- a/roles/kiwix/tasks/nginx.yml +++ b/roles/kiwix/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/kolibri/tasks/enable-or-disable.yml b/roles/kolibri/tasks/enable-or-disable.yml index 8204b3aee..aaeec6046 100644 --- a/roles/kolibri/tasks/enable-or-disable.yml +++ b/roles/kolibri/tasks/enable-or-disable.yml @@ -28,5 +28,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/lokole/tasks/nginx.yml b/roles/lokole/tasks/nginx.yml index 9ba756bf8..a07c97a24 100644 --- a/roles/lokole/tasks/nginx.yml +++ b/roles/lokole/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/mediawiki/tasks/nginx.yml b/roles/mediawiki/tasks/nginx.yml index 85c4e1429..9b5d50154 100644 --- a/roles/mediawiki/tasks/nginx.yml +++ b/roles/mediawiki/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/moodle/tasks/enable-or-disable.yml b/roles/moodle/tasks/enable-or-disable.yml index 687d6db1e..8339e5f05 100644 --- a/roles/moodle/tasks/enable-or-disable.yml +++ b/roles/moodle/tasks/enable-or-disable.yml @@ -27,5 +27,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/munin/tasks/enable-or-disable.yml b/roles/munin/tasks/enable-or-disable.yml index 1b0d3ac28..3561f4397 100644 --- a/roles/munin/tasks/enable-or-disable.yml +++ b/roles/munin/tasks/enable-or-disable.yml @@ -28,5 +28,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/nginx/tasks/enable-or-disable.yml b/roles/nginx/tasks/enable-or-disable.yml index 15f1c70b5..66cb61403 100644 --- a/roles/nginx/tasks/enable-or-disable.yml +++ b/roles/nginx/tasks/enable-or-disable.yml @@ -27,7 +27,7 @@ - name: Enable & (Re)Start 'nginx' systemd service, if nginx_enabled systemd: - name: nginx + name: "{{ systemd_unit_name }}" daemon_reload: yes enabled: yes state: restarted @@ -42,7 +42,7 @@ - name: Disable & Stop 'nginx' systemd service, if not nginx_enabled systemd: - name: nginx + name: "{{ systemd_unit_name }}" enabled: no state: stopped when: not nginx_enabled diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index 98ac48e96..1ae4e37ba 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -73,11 +73,15 @@ - uwsgi_params - win-utf + - name: Alter systemd_unit_name to be iiab-nginx.service from nginx.service + set_fact: + systemd_unit_name: iiab-nginx + - name: Grab stock unit file copy: force: yes src: /lib/systemd/system/nginx.service - dest: /etc/systemd/system/iiab-nginx.service + dest: /etc/systemd/system/"{{ systemd_unit_name }}".service - name: shove {{ nginx_dir }}/nginx.conf into unit file command: sed -i 's|/usr/sbin/nginx|/usr/sbin/nginx -c {{ nginx_dir }}/nginx.conf|' /etc/systemd/system/iiab-nginx.service diff --git a/roles/nodered/tasks/enable-or-disable.yml b/roles/nodered/tasks/enable-or-disable.yml index 87a1c8d2a..63d41aa7b 100644 --- a/roles/nodered/tasks/enable-or-disable.yml +++ b/roles/nodered/tasks/enable-or-disable.yml @@ -28,5 +28,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/osm-vector-maps/tasks/nginx.yml b/roles/osm-vector-maps/tasks/nginx.yml index 15c281db8..e1db6d2ce 100644 --- a/roles/osm-vector-maps/tasks/nginx.yml +++ b/roles/osm-vector-maps/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Reload 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: reloaded diff --git a/roles/pbx/tasks/enable-or-disable.yml b/roles/pbx/tasks/enable-or-disable.yml index 2abc11405..f27e44172 100644 --- a/roles/pbx/tasks/enable-or-disable.yml +++ b/roles/pbx/tasks/enable-or-disable.yml @@ -98,7 +98,7 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/sugarizer/tasks/enable-or-disable.yml b/roles/sugarizer/tasks/enable-or-disable.yml index 8abccd61b..243bfe9ae 100644 --- a/roles/sugarizer/tasks/enable-or-disable.yml +++ b/roles/sugarizer/tasks/enable-or-disable.yml @@ -28,5 +28,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/usb_lib/tasks/nginx.yml b/roles/usb_lib/tasks/nginx.yml index 7e572142a..55420b78b 100644 --- a/roles/usb_lib/tasks/nginx.yml +++ b/roles/usb_lib/tasks/nginx.yml @@ -30,5 +30,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/wordpress/tasks/nginx.yml b/roles/wordpress/tasks/nginx.yml index c55d1223e..71c03bc54 100644 --- a/roles/wordpress/tasks/nginx.yml +++ b/roles/wordpress/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted diff --git a/roles/www_options/tasks/main.yml b/roles/www_options/tasks/main.yml index 90f5cc6b6..737c3ac3e 100644 --- a/roles/www_options/tasks/main.yml +++ b/roles/www_options/tasks/main.yml @@ -167,7 +167,7 @@ - name: (Re)Start 'nginx' systemd service, if nginx_enabled systemd: - name: nginx + name: "{{ systemd_unit_name }}" state: restarted when: nginx_enabled diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 89bae515c..a28e05419 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -283,6 +283,7 @@ nginx_interface: 0.0.0.0 nginx_dir: /etc/nginx nginx_conf_dir: "{{ nginx_dir }}/conf.d" nginx_log_dir: /var/log/nginx +systemd_unit_name: nginx # SEE BELOW: nginx_high_php_limits, apache_allow_sudo # roles/www_base runs here (mandatory)