From 2b09904b63d8dfbc0bf6617953df3e042ef14acb Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 18 Nov 2019 23:53:17 -0600 Subject: [PATCH] correct botched rebase of only_nginx.yml --- roles/nginx/tasks/only_nginx.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/nginx/tasks/only_nginx.yml b/roles/nginx/tasks/only_nginx.yml index 73f809204..dce442d5b 100644 --- a/roles/nginx/tasks/only_nginx.yml +++ b/roles/nginx/tasks/only_nginx.yml @@ -40,6 +40,7 @@ - name: Remove nginx support for sugarizer file: path: /etc/nginx/conf.d/sugarizer-nginx.conf + state: absent when: not sugarizer_enabled | bool - name: Remove /etc/apache2/sites-enabled/kolibri.conf @@ -61,11 +62,11 @@ - name: Remove nginx support for kolibri when not kolibri_enabled file: path: /etc/nginx/conf.d/kolibri-nginx.conf + state: absent when: not kolibri_enabled | bool - name: Disable /etc/apache2/sites-enabled/calibre-web.conf command: a2dissite calibre-web.conf - when: not calibreweb_enabled - name: Install /etc/nginx/conf.d/calibre-web-nginx.conf template: @@ -78,7 +79,8 @@ - { src: 'roles/calibre-web/templates/calibre-web-nginx.conf.j2', dest: '/etc/nginx/conf.d/calibre-web-nginx.conf', mode: '0644' } when: calibreweb_enabled -- name: Remove nginx support for sugarizer +- name: Remove nginx support for Calibre-Web file: - path: /etc/nginx/conf.d/sugarizer-nginx.conf + path: /etc/nginx/conf.d/calibre-web-nginx.conf + state: absent when: not calibreweb_enabled | bool