Added rules for dealing with old virtualhost files in

/etc/apache2/sites-available and old (dangling) symlinks in
/etc/apaches/sites-enabled.
Also, remove unnecessary apache2 restart after creating a new
virtualhost but not yet enabling it.

roles/blog/tasks/blog.yml

@@ -1,9 +1,16 @@
 - name: Create directory for blog HTML
   file: state=directory path=/var/www/{{ domain }} group=www-data owner=www-data
 
+- name: Rename existing Apache blog virtualhost
+  command: mv /etc/apache2/sites-available/{{ domain }} /etc/apache2/sites-available/{{ domain }}.conf
+  removes: /etc/apache2/sites-available/{{ domain }}
+
+- name: Remove old sites-enabled/{{ domain }} symlink (new one will be created by a2ensite)
+  command: rm /etc/apache2/sites-enabled/{{ domain }}
+  removes: /etc/apache2/sites-enabled/{{ domain }}
+
 - name: Configure the Apache HTTP server for the blog
   template: src=etc_apache2_sites-available_blog.j2 dest=/etc/apache2/sites-available/{{ domain }}.conf group=root owner=root
-  notify: restart apache
 
 - name: Enable blog site
   command: a2ensite {{ domain }}.conf creates=/etc/apache2/sites-enabled/{{ domain }}.conf

roles/git/tasks/cgit.yml

@@ -32,12 +32,19 @@
             group=www-data
             owner=www-data
 
+- name: Rename existing Apache cgit virtualhost
+  command: mv /etc/apache2/sites-available/cgit /etc/apache2/sites-available/cgit.conf
+  removes: /etc/apache2/sites-available/cgit
+
+- name: Remove old sites-enabled/cgit symlink (new one will be created by a2ensite)
+  command: rm /etc/apache2/sites-enabled/cgit
+  removes: /etc/apache2/sites-enabled/cgit
+
 - name: Configure the Apache HTTP server for cgit
   template: src=etc_apache2_sites-available_cgit.j2
             dest=/etc/apache2/sites-available/cgit.conf
             group=root
             owner=root
-  notify: restart apache
 
 - name: Enable Apache cgi module
   command: a2enmod cgi creates=/etc/apache2/mods-enabled/cgi.load

roles/newebe/tasks/main.yml

@@ -71,12 +71,20 @@
 # When Ansible 1.6 will be available  
 # apache2_module: state=present name=proxy_http
 #
+
+- name: Rename existing Apache newebe virtualhost
+  command: mv /etc/apache2/sites-available/newebe /etc/apache2/sites-available/newebe.conf
+  removes: /etc/apache2/sites-available/newebe
+
+- name: Remove old sites-enabled/newebe symlink (new one will be created by a2ensite)
+  command: rm /etc/apache2/sites-enabled/newebe
+  removes: /etc/apache2/sites-enabled/newebe
+
 - name: Configure the Apache HTTP server for Newebe
   template: src=etc_apache2_sites-available_newebe.j2
             dest=/etc/apache2/sites-available/newebe.conf
             group=root
             owner=root
-  notify: restart apache
 
 - name: Enable the site
   command: a2ensite newebe.conf

roles/news/tasks/selfoss.yml

@@ -26,9 +26,16 @@
   command: a2enmod expires creates=/etc/apache2/mods-enabled/expires.load
   notify: restart apache
 
+- name: Rename existing Apache blog virtualhost
+  command: mv /etc/apache2/sites-available/selfoss /etc/apache2/sites-available/selfoss.conf
+  removes: /etc/apache2/sites-available/selfoss
+
+- name: Remove old sites-enabled/selfoss symlink (new one will be created by a2ensite)
+  command: rm /etc/apache2/sites-enabled/selfoss
+  removes: /etc/apache2/sites-enabled/selfoss
+
 - name: Configure the Apache HTTP server for selfoss
   template: src=etc_apache2_sites-available_selfoss.j2 dest=/etc/apache2/sites-available/selfoss.conf group=root owner=root
-  notify: restart apache
 
 - name: Enable the selfoss site
   command: a2ensite selfoss.conf creates=/etc/apache2/sites-enabled/selfoss.conf

roles/owncloud/tasks/owncloud.yml

@@ -44,9 +44,16 @@
   command: a2enmod expires creates=/etc/apache2/mods-enabled/expires.load
   notify: restart apache
 
+- name: Rename existing Apache owncloud virtualhost
+  command: mv /etc/apache2/sites-available/owncloud /etc/apache2/sites-available/owncloud.conf
+  removes: /etc/apache2/sites-available/owncloud
+
+- name: Remove old sites-enabled/owncloud symlink (new one will be created by a2ensite)
+  command: rm /etc/apache2/sites-enabled/owncloud
+  removes: /etc/apache2/sites-enabled/owncloud
+
 - name: Configure the Apache HTTP server for ownCloud
   template: src=etc_apache2_sites-available_owncloud.j2 dest=/etc/apache2/sites-available/owncloud.conf group=root owner=root
-  notify: restart apache
 
 - name: Enable the owncloud site
   command: a2ensite owncloud.conf creates=/etc/apache2/sites-enabled/owncloud.conf

roles/readlater/tasks/wallabag.yml

@@ -52,12 +52,19 @@
             owner=www-data
             group=www-data
 
+- name: Rename existing Apache wallabag virtualhost
+  command: mv /etc/apache2/sites-available/wallabag /etc/apache2/sites-available/wallabag.conf
+  removes: /etc/apache2/sites-available/wallabag
+
+- name: Remove old sites-enabled/wallabag symlink (new one will be created by a2ensite)
+  command: rm /etc/apache2/sites-enabled/wallabag
+  removes: /etc/apache2/sites-enabled/wallabag
+
 - name: Configure the Apache HTTP server for wallabag
   template: src=etc_apache2_sites-available_wallabag.j2
             dest=/etc/apache2/sites-available/wallabag.conf
             owner=root
             group=root
-  notify: restart apache
 
 - name: Enable the wallabag site
   command: a2ensite wallabag.conf

roles/webmail/tasks/roundcube.yml

@@ -32,6 +32,14 @@
     - carddav
     - twofactor_gauthenticator
 
+- name: Rename existing Apache roundcube virtualhost
+  command: mv /etc/apache2/sites-available/roundcube /etc/apache2/sites-available/roundcube.conf
+  removes: /etc/apache2/sites-available/roundcube
+
+- name: Remove old sites-enabled/roundcube symlink (new one will be created by a2ensite)
+  command: rm /etc/apache2/sites-enabled/roundcube
+  removes: /etc/apache2/sites-enabled/roundcube
+
 - name: Configure the Apache HTTP server for roundcube
   template: src=etc_apache2_sites-available_roundcube.j2 dest=/etc/apache2/sites-available/roundcube.conf group=root owner=root force=yes