Merge pull request #265 from lvillani/ubuntu

Merge pull request #265

roles/common/tasks/encfs.yml

@@ -3,7 +3,7 @@
   with_items:
     - encfs
     - libfuse-dev
-    - fuse-utils
+    - fuse
 
 - name: Create encrypted directory
   file: state=directory path=/encrypted

roles/common/tasks/main.yml

@@ -46,6 +46,16 @@
 - name: Set ServerName for Apache
   template: src=fqdn.j2 dest=/etc/apache2/conf.d/fqdn
   notify: restart apache
+  when: ansible_distribution_release != 'trusty'
+
+- name: Create ServerName configuration file for Apache for Ubuntu Trusty
+  template: src=fqdn.j2 dest=/etc/apache2/conf-available/fqdn.conf
+  when: ansible_distribution_release == 'trusty'
+
+- name: Set ServerName for Apache for Ubuntu Trusty
+  command: a2enconf fqdn creates=/etc/apache2/conf-enabled/fqdn.conf
+  notify: restart apache
+  when: ansible_distribution_release == 'trusty'
 
 - include: encfs.yml tags=encfs
 - include: users.yml tags=users

roles/mailserver/tasks/z-push.yml

@@ -36,6 +36,16 @@
 - name: Configure z-push apache alias and php settings
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf.d/z-push.conf
   notify: restart apache
-  
+  when: ansible_distribution_release != 'trusty'
+
+- name: Create z-push apache alias and php configuration file for Ubuntu Trusty
+  copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf-available/z-push.conf
+  when: ansible_distribution_release == 'trusty'
+
+- name: Enable z-push Apache alias and PHP configuration file for Ubuntu Trusty
+  command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
+  notify: restart apache
+  when: ansible_distribution_release == 'trusty'
+
 - name: Configure z-push logrotate
   copy: src=etc_logrotate_z-push dest=/etc/logrotate.d/z-push owner=root group=root mode=0644