From 4e7eaa4c02de6dfa66115650165df2a1681e8f2f Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sun, 12 Jan 2020 02:15:47 -0500
Subject: [PATCH] Prune 30 lines from nginx/tasks/only_nginx.yml

---
 roles/nginx/tasks/only_nginx.yml | 42 +++++---------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/roles/nginx/tasks/only_nginx.yml b/roles/nginx/tasks/only_nginx.yml
index f3c26719f..e97117913 100644
--- a/roles/nginx/tasks/only_nginx.yml
+++ b/roles/nginx/tasks/only_nginx.yml
@@ -1,15 +1,10 @@
 - name: Remove symlink /etc/apache2/sites-enabled/awstats.conf
-  file:
-    path: /etc/apache2/sites-enabled/awstats.conf
-    state: absent
+  command: a2dissite awstats.conf
 
 - name: Install /etc/nginx/conf.d/awstats-nginx.conf from template, if awstats_enabled
   template:
     src: roles/awstats/templates/awstats-nginx.conf
     dest: /etc/nginx/conf.d/awstats-nginx.conf
-    # owner: root
-    # group: root
-    # mode: '0644'
   when: awstats_enabled | bool
 
 - name: Remove NGINX support for AWStats, if not awstats_enabled
@@ -20,17 +15,12 @@
 
 
 - name: Remove symlink /etc/apache2/sites-enabled/calibre-web.conf
-  file:
-    path: /etc/apache2/sites-enabled/calibre-web.conf
-    state: absent
+  command: a2dissite calibre-web.conf
 
 - name: Install /etc/nginx/conf.d/calibre-web-nginx.conf from template, if calibreweb_enabled
   template:
     src: roles/calibre-web/templates/calibre-web-nginx.conf.j2
     dest: /etc/nginx/conf.d/calibre-web-nginx.conf
-    # owner: root
-    # group: root
-    # mode: '0644'
   when: calibreweb_enabled | bool
 
 - name: Remove NGINX support for Calibre-Web, if not calibreweb_enabled
@@ -41,17 +31,12 @@
 
 
 - name: Remove symlink /etc/apache2/sites-enabled/gitea.conf
-  file:
-    path: /etc/apache2/sites-enabled/gitea.conf
-    state: absent
+  command: a2dissite gitea.conf
 
 - name: Install /etc/nginx/conf.d/gitea-nginx.conf from template, if gitea_enabled
   template:
     src: roles/gitea/templates/gitea-nginx.conf.j2
     dest: /etc/nginx/conf.d/gitea-nginx.conf
-    # owner: root
-    # group: root
-    # mode: '0644'
   when: gitea_enabled | bool
 
 - name: Remove NGINX support for Gitea, if not gitea_enabled
@@ -62,17 +47,12 @@
 
 
 - name: Remove symlink /etc/apache2/sites-enabled/kiwix.conf
-  file:
-    path: /etc/apache2/sites-enabled/kiwix.conf
-    state: absent
+  command: a2dissite kiwix.conf
 
 - name: Install /etc/nginx/conf.d/kiwix-nginx.conf from template, if kiwix_enabled
   template:
     src: roles/kiwix/templates/kiwix-nginx.conf
     dest: /etc/nginx/conf.d/kiwix-nginx.conf
-    # owner: root
-    # group: root
-    # mode: '0644'
   when: kiwix_enabled | bool
 
 - name: Remove NGINX support for Kiwix, if not kiwix_enabled
@@ -83,17 +63,12 @@
 
 
 - name: Remove symlink /etc/apache2/sites-enabled/kolibri.conf
-  file:
-    path: /etc/apache2/sites-enabled/kolibri.conf
-    state: absent
+  command: a2dissite kolibri.conf
 
 - name: Install /etc/nginx/conf.d/kolibri-nginx.conf from template, if kolibri_enabled
   template:
     src: roles/kolibri/templates/kolibri-nginx.conf.j2
     dest: /etc/nginx/conf.d/kolibri-nginx.conf
-    # owner: root
-    # group: root
-    # mode: '0644'
   when: kolibri_enabled | bool
 
 - name: Remove NGINX support for Kolibri, if not kolibri_enabled
@@ -104,17 +79,12 @@
 
 
 - name: Remove symlink /etc/apache2/sites-enabled/sugarizer.conf
-  file:
-    path: /etc/apache2/sites-enabled/sugarizer.conf
-    state: absent
+  command: a2dissite sugarizer.conf
 
 - name: Install /etc/nginx/conf.d/sugarizer-nginx.conf from template, if sugarizer_enabled
   template:
     src: roles/sugarizer/templates/sugarizer-nginx.conf
     dest: /etc/nginx/conf.d/sugarizer-nginx.conf
-    # owner: root
-    # group: root
-    # mode: '0644'
   when: sugarizer_enabled | bool
 
 - name: Remove NGINX support for Sugarizer, if not sugarizer_enabled