From b23f1f1638d12c8d648ec592d5c628eabf95879b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 23 Jan 2020 15:22:51 -0500 Subject: [PATCH] Update and rename wordpress/enable-or-disable.yml to nginx.yml --- roles/wordpress/tasks/enable-or-disable.yml | 35 --------------------- roles/wordpress/tasks/nginx.yml | 16 ++++++++++ 2 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 roles/wordpress/tasks/enable-or-disable.yml create mode 100644 roles/wordpress/tasks/nginx.yml diff --git a/roles/wordpress/tasks/enable-or-disable.yml b/roles/wordpress/tasks/enable-or-disable.yml deleted file mode 100644 index b4f7db83c..000000000 --- a/roles/wordpress/tasks/enable-or-disable.yml +++ /dev/null @@ -1,35 +0,0 @@ -# Apache - -- name: Enable http://box{{ wp_url }} via Apache - command: a2ensite wordpress.conf - when: apache_install and wordpress_enabled - -- name: Disable http://box{{ wp_url }} via Apache - command: a2dissite wordpress.conf - when: apache_install and not wordpress_enabled - -- name: Restart Apache systemd service ({{ apache_service }}) - systemd: - name: "{{ apache_service }}" # apache2 or httpd, as set in /opt/iiab/iiab/vars/.yml - state: restarted - when: apache_install and apache_enabled - -# NGINX - -- name: Enable http://box{{ wp_url }} via NGINX, by installing {{ nginx_config_dir }}/wordpress-nginx.conf from template - template: - src: wordpress-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d - when: wordpress_enabled # and nginx_enabled - -- name: Disable http://box{{ wp_url }} via NGINX, by removing {{ nginx_config_dir }}/wordpress-nginx.conf - file: - path: "{{ nginx_config_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d - state: absent - when: not wordpress_enabled - -- name: Restart 'nginx' systemd service - systemd: - name: nginx - state: restarted - #when: nginx_enabled | bool diff --git a/roles/wordpress/tasks/nginx.yml b/roles/wordpress/tasks/nginx.yml new file mode 100644 index 000000000..13058fbcc --- /dev/null +++ b/roles/wordpress/tasks/nginx.yml @@ -0,0 +1,16 @@ +- name: Enable http://box{{ wp_url }} via NGINX, by installing {{ nginx_config_dir }}/wordpress-nginx.conf from template + template: + src: wordpress-nginx.conf.j2 + dest: "{{ nginx_config_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d + when: wordpress_enabled + +- name: Disable http://box{{ wp_url }} via NGINX, by removing {{ nginx_config_dir }}/wordpress-nginx.conf + file: + path: "{{ nginx_config_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d + state: absent + when: not wordpress_enabled + +- name: Restart 'nginx' systemd service + systemd: + name: nginx + state: restarted