From 55a36a42ba3803e744e0d6e9ff2e4e67557ded1d Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 6 Apr 2022 01:34:22 -0500 Subject: [PATCH] grep -rlZ 'systemd_unit_name' | xargs -0 sed -i 's/systemd_unit_name/nginx_systemd_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 | 10 +++++----- roles/nginx/templates/nginx.conf.j2 | 2 +- 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 | 2 +- 25 files changed, 30 insertions(+), 30 deletions(-) diff --git a/roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml b/roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml index 0189bbaa6..559ed9f37 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_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 5b36b4fc9..db9d5982f 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/awstats/tasks/nginx.yml b/roles/awstats/tasks/nginx.yml index 35b36c5d9..43aa3c88a 100644 --- a/roles/awstats/tasks/nginx.yml +++ b/roles/awstats/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/calibre-web/tasks/enable-or-disable.yml b/roles/calibre-web/tasks/enable-or-disable.yml index f5388a672..8f6926a5d 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/cups/tasks/nginx.yml b/roles/cups/tasks/nginx.yml index 13b618dd3..8aa75ff47 100644 --- a/roles/cups/tasks/nginx.yml +++ b/roles/cups/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/gitea/tasks/enable-or-disable.yml b/roles/gitea/tasks/enable-or-disable.yml index 2251cff37..0f1cecf55 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/internetarchive/tasks/enable-or-disable.yml b/roles/internetarchive/tasks/enable-or-disable.yml index c95b92a77..10a7164b5 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/jupyterhub/tasks/enable-or-disable.yml b/roles/jupyterhub/tasks/enable-or-disable.yml index bb4d32d3d..621287930 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/kiwix/tasks/nginx.yml b/roles/kiwix/tasks/nginx.yml index 00452b924..54a1e7628 100644 --- a/roles/kiwix/tasks/nginx.yml +++ b/roles/kiwix/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/kolibri/tasks/enable-or-disable.yml b/roles/kolibri/tasks/enable-or-disable.yml index aaeec6046..8177f97a1 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/lokole/tasks/nginx.yml b/roles/lokole/tasks/nginx.yml index a07c97a24..3de3f2a20 100644 --- a/roles/lokole/tasks/nginx.yml +++ b/roles/lokole/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/mediawiki/tasks/nginx.yml b/roles/mediawiki/tasks/nginx.yml index 9b5d50154..c4cc5785c 100644 --- a/roles/mediawiki/tasks/nginx.yml +++ b/roles/mediawiki/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/moodle/tasks/enable-or-disable.yml b/roles/moodle/tasks/enable-or-disable.yml index 8339e5f05..4306dc02e 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/munin/tasks/enable-or-disable.yml b/roles/munin/tasks/enable-or-disable.yml index 3561f4397..6afe781b6 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/nginx/tasks/enable-or-disable.yml b/roles/nginx/tasks/enable-or-disable.yml index 3131dc781..ae028a23f 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" daemon_reload: yes enabled: yes state: restarted @@ -35,7 +35,7 @@ - name: Disable & Stop 'nginx' systemd service, if not nginx_enabled systemd: - name: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" enabled: no state: stopped when: not nginx_enabled diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index 6e71a133c..9e5d514c7 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -77,10 +77,10 @@ copy: force: yes src: /lib/systemd/system/nginx.service - dest: /etc/systemd/system/{{ systemd_unit_name }}.service + dest: /etc/systemd/system/{{ nginx_systemd_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|g' /etc/systemd/system/{{ systemd_unit_name }}.service + command: sed -i 's|/usr/sbin/nginx|/usr/sbin/nginx -c {{ nginx_dir }}/nginx.conf|g' /etc/systemd/system/{{ nginx_systemd_name }}.service # lineinfile: # path: /etc/systemd/system/nginx.service # state: present @@ -91,11 +91,11 @@ # - { regexp: '^ExecStart=/usr/sbin/nginx', line: 'ExecStart=/usr/sbin/nginx -c {{ nginx_dir }}/nginx.conf' } # - { regexp: '^ExecReload=/usr/sbin/nginx', line: 'ExecReload=/usr/sbin/nginx -c {{ nginx_dir }}/nginx.conf' } - - name: Alter /run/nginx.pid to be /run/{{ systemd_unit_name }}.pid in unit file. - command: sed -i 's|/run/nginx.pid|/run/{{ systemd_unit_name }}.pid|g' /etc/systemd/system/{{ systemd_unit_name }}.service + - name: Alter /run/nginx.pid to be /run/{{ nginx_systemd_name }}.pid in unit file. + command: sed -i 's|/run/nginx.pid|/run/{{ nginx_systemd_name }}.pid|g' /etc/systemd/system/{{ nginx_systemd_name }}.service # end block - when: systemd_unit_name != "nginx" or nginx_dir != "/etc/nginx" + when: nginx_systemd_name != "nginx" or nginx_dir != "/etc/nginx" - name: 'Install 3 (of 5) files from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/nginx/mime.types' template: diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2 index f7659bed0..bd2b18936 100644 --- a/roles/nginx/templates/nginx.conf.j2 +++ b/roles/nginx/templates/nginx.conf.j2 @@ -4,7 +4,7 @@ user www-data; worker_processes auto; -pid /run/{{ systemd_unit_name }}.pid; +pid /run/{{ nginx_systemd_name }}.pid; include {{ nginx_dir }}/modules-enabled/*.conf; events { diff --git a/roles/nodered/tasks/enable-or-disable.yml b/roles/nodered/tasks/enable-or-disable.yml index 63d41aa7b..5893d30e0 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/osm-vector-maps/tasks/nginx.yml b/roles/osm-vector-maps/tasks/nginx.yml index e1db6d2ce..b16031320 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: reloaded diff --git a/roles/pbx/tasks/enable-or-disable.yml b/roles/pbx/tasks/enable-or-disable.yml index f27e44172..c0798294d 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/sugarizer/tasks/enable-or-disable.yml b/roles/sugarizer/tasks/enable-or-disable.yml index 243bfe9ae..da72d935d 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/usb_lib/tasks/nginx.yml b/roles/usb_lib/tasks/nginx.yml index 55420b78b..7cb0d2289 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/wordpress/tasks/nginx.yml b/roles/wordpress/tasks/nginx.yml index 71c03bc54..66c1e6277 100644 --- a/roles/wordpress/tasks/nginx.yml +++ b/roles/wordpress/tasks/nginx.yml @@ -12,5 +12,5 @@ - name: Restart 'nginx' systemd service systemd: - name: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted diff --git a/roles/www_options/tasks/main.yml b/roles/www_options/tasks/main.yml index 737c3ac3e..e2027b35c 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: "{{ systemd_unit_name }}" + name: "{{ nginx_systemd_name }}" state: restarted when: nginx_enabled diff --git a/vars/default_vars.yml b/vars/default_vars.yml index a28e05419..8d5fb6b23 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -283,7 +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 +nginx_systemd_name: nginx # SEE BELOW: nginx_high_php_limits, apache_allow_sudo # roles/www_base runs here (mandatory)