Merge pull request #242 from neuhaus/patch-2

apache sites: Wrong ownership and filename

roles/blog/tasks/blog.yml

@@ -1,11 +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 }} group=www-data owner=www-data
-  notify: restart apache
+  template: src=etc_apache2_sites-available_blog.j2 dest=/etc/apache2/sites-available/{{ domain }}.conf group=root owner=root
 
 - name: Enable blog site
-  command: a2ensite {{ domain }} creates=/etc/apache2/sites-enabled/{{ domain }}
+  command: a2ensite {{ domain }}.conf creates=/etc/apache2/sites-enabled/{{ domain }}.conf
   notify: restart apache
 

roles/git/tasks/cgit.yml

@@ -32,12 +32,17 @@
             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
-            group=www-data
-            owner=www-data
-  notify: restart apache
+            dest=/etc/apache2/sites-available/cgit.conf
+            group=root
+            owner=root
 
 - name: Enable Apache cgi module
   command: a2enmod cgi creates=/etc/apache2/mods-enabled/cgi.load
@@ -48,5 +53,5 @@
   notify: restart apache
 
 - name:  Enable cgit site
-  command: a2ensite cgit creates=/etc/apache2/sites-enabled/cgit
+  command: a2ensite cgit.conf creates=/etc/apache2/sites-enabled/cgit.conf
   notify: restart apache

roles/mailserver/tasks/dovecot.yml

@@ -8,6 +8,19 @@
     - dovecot-managesieved
     - postgresql-9.1
     - dovecot-pgsql
+  when: ansible_distribution_release != 'trusty'
+
+- name: Install Dovecot and related packages for Ubuntu trusty
+  apt: pkg={{ item }} state=installed
+  with_items:
+    - dovecot-core
+    - dovecot-imapd
+    - dovecot-pop3d
+    - dovecot-lmtpd
+    - dovecot-managesieved
+    - postgresql-9.3
+    - dovecot-pgsql
+  when: ansible_distribution_release == 'trusty'
 
 - name: Create vmail group
   group: name=vmail state=present gid=5000

roles/mailserver/tasks/postfix.yml

@@ -1,4 +1,4 @@
-- name: Install Postfix and related packages
+- name: Install Postfix 9.1 and related packages
   apt: pkg={{ item }} state=installed
   with_items:
     - postfix
@@ -9,6 +9,20 @@
     - postfix-pgsql
     - python-psycopg2
     - postfix-pcre
+  when: ansible_distribution_release != 'trusty'
+
+- name: Install Postfix 9.3 and related packages for Ubuntu Trusty
+  apt: pkg={{ item }} state=installed
+  with_items:
+    - postfix
+    - libsasl2-modules
+    - sasl2-bin
+    - postgrey
+    - postgresql-9.3
+    - postfix-pgsql
+    - python-psycopg2
+    - postfix-pcre
+  when: ansible_distribution_release == 'trusty'
 
 - name: Set postgres password
   command: sudo -u {{ db_admin_username }} psql -d {{ db_admin_username }} -c "ALTER USER postgres with  password '{{ db_admin_password }}';"

roles/newebe/tasks/main.yml

@@ -71,14 +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
-            group=www-data
-            owner=www-data
-  notify: restart apache
+            dest=/etc/apache2/sites-available/newebe.conf
+            group=root
+            owner=root
 
 - name: Enable the site
-  command: a2ensite newebe
-           creates=/etc/apache2/sites-enabled/newebe
+  command: a2ensite newebe.conf
+           creates=/etc/apache2/sites-enabled/newebe.conf
   notify: restart apache

roles/news/tasks/selfoss.yml

@@ -26,12 +26,17 @@
   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 group=www-data owner=www-data
-  notify: restart apache
+  template: src=etc_apache2_sites-available_selfoss.j2 dest=/etc/apache2/sites-available/selfoss.conf group=root owner=root
 
 - name: Enable the selfoss site
-  command: a2ensite selfoss creates=/etc/apache2/sites-enabled/selfoss
+  command: a2ensite selfoss.conf creates=/etc/apache2/sites-enabled/selfoss.conf
   notify: restart apache
 
 - name: Install selfoss cronjob

roles/owncloud/tasks/owncloud.yml

@@ -10,15 +10,23 @@
 
 - name: Ensure repository key for ownCloud is in place
   apt_key: url=http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_7.0/Release.key state=present
+  when: ansible_distribution == 'Debian'
 
 - name: Add ownCloud OpenSuSE repository
   apt_repository: repo='deb http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_7.0/ /'
+  when: ansible_distribution == 'Debian'
 
-- name: Install ownCloud from OpenSuSE repository
+- name: Install ownCloud (possibly from OpenSuSE repository)
   apt: pkg=owncloud update_cache=yes
 
-- name: Install PHP-APC
-  apt: pkg=php-apc
+- name: Install PHP dependencies
+  apt: pkg={{ item }} state=present
+  with_items:
+    - php-apc
+    - libapache2-mod-php5
+
+- name: Owncloud www directory
+  file: state=directory path=/var/www/owncloud
 
 - name: Store ownCloud data securely
   command: mv /var/www/owncloud/data /decrypted/owncloud-data creates=/decrypted/owncloud-data
@@ -36,12 +44,17 @@
   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 group=www-data owner=www-data
-  notify: restart apache
+  template: src=etc_apache2_sites-available_owncloud.j2 dest=/etc/apache2/sites-available/owncloud.conf group=root owner=root
 
 - name: Enable the owncloud site
-  command: a2ensite owncloud creates=/etc/apache2/sites-enabled/owncloud
+  command: a2ensite owncloud.conf creates=/etc/apache2/sites-enabled/owncloud.conf
   notify: restart apache
 
 - name: Install ownCloud cronjob

roles/readlater/tasks/wallabag.yml

@@ -52,14 +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
-            owner=www-data
-            group=www-data
-  notify: restart apache
+            dest=/etc/apache2/sites-available/wallabag.conf
+            owner=root
+            group=root
 
 - name: Enable the wallabag site
-  command: a2ensite wallabag
-           creates=/etc/apache2/sites-enabled/wallabag
+  command: a2ensite wallabag.conf
+           creates=/etc/apache2/sites-enabled/wallabag.conf
   notify: restart apache

roles/webmail/tasks/roundcube.yml

@@ -32,8 +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 group=www-data owner=www-data force=yes
+  template: src=etc_apache2_sites-available_roundcube.j2 dest=/etc/apache2/sites-available/roundcube.conf group=root owner=root force=yes
 
 - name: Configure roundcube
   copy: src={{ item.src }} dest={{ item.dest }} group=www-data owner=root mode=640 force=yes
@@ -45,6 +51,6 @@
   - { src: 'etc_roundcube_global.sieve',                                          dest: '/etc/roundcube/global.sieve' }
 
 - name: Enable roundcube site
-  command: a2ensite roundcube creates=/etc/apache2/sites-enabled/roundcube
+  command: a2ensite roundcube.conf creates=/etc/apache2/sites-enabled/roundcube.conf
   notify: restart apache
 

roles/xmpp/tasks/prosody.yml

@@ -1,8 +1,9 @@
 - name: Ensure repository key for Prosody is in place
   apt_key: url=https://prosody.im/files/prosody-debian-packages.key state=present
 
-- name: Add Prosody repository
-  apt_repository: repo='deb http://packages.prosody.im/debian wheezy main'
+# Prosody supplies repo for sid, squeeze, wheezy, jessie, trusty, saucy, raring, quantal, precise and lucid
+- name: Add Prosody Debian/Ubuntu repository
+  apt_repository: repo="deb http://packages.prosody.im/debian {{ ansible_distribution_release }} main"
 
 - name: Install Prosody from official repository
   apt: pkg=prosody update_cache=yes