conventions accross platforms

roles/6-generic-apps/meta/main.yml

@@ -2,6 +2,7 @@ dependencies:
    - { role: mysql, tags: ['generic','mysql'], when: mysql_install }
    - { role: elgg, tags: ['generic','elgg'], when: elgg_install }
    - { role: owncloud, tags: ['generic','owncloud'], when: owncloud_install }
+   - { role: nextcloud, tags: ['generic','nextcloud'], when: nextcloud_install }
    - { role: dokuwiki, tags: ['generic','dokuwiki'], when: dokuwiki_install }
    - { role: wordpress, tags: ['generic','wordpress'], when: wordpress_install }
    - { role: calibre, tags: ['generic','calibre'], when: calibre_install }

roles/nextcloud/defaults/main.yml

@@ -5,7 +5,7 @@ nextcloud_url: /nextcloud
 nextcloud_prefix: /opt
 nextcloud_data_dir: /library/nextcloud/data
 nextcloud_dl_url: https://download.nextcloud.com/server/releases/
-nextcloud_src_file: latest-11.tar.bz2
+nextcloud_src_file: latest-12.tar.bz2
 
 # we install on mysql with these setting or those from default_vars, etc.
 nextcloud_dbname: nextcloud

roles/nextcloud/tasks/main.yml

@@ -16,17 +16,31 @@
   tags:
     - download
 
+- name: Install list of packages for debuntu
+  apt: name={{ item }} state=installed
+  with_items:   
+    - libapache2-mod-php5
+    - php{{ php_version }}-gd
+    - php{{ php_version }}-json
+    - php{{ php_version }}-mysql
+    - php{{ php_version }}-curl
+    - php{{ php_version }}-intl
+    - php{{ php_version }}-mcrypt
+    - php{{ php_version }}-imagick
+  when: is_debuntu
+     
 - name: Install list of packages  
   apt: name={{ item }} state=installed
   with_items:   
     - libapache2-mod-php5
-    - php5-gd
-    - php5-json
-    - php5-mysql
-    - php5-curl
-    - php5-intl
-    - php5-mcrypt
-    - php5-imagick
+    - php-gd
+    - php-json
+    - php-mysql
+    - php-curl
+    - php-intl
+    - php-mcrypt
+    - php-imagick
+  when: is_redhat
      
 - name: Copy it to permanent location /opt
   unarchive: src={{ downloads_dir }}/{{ nextcloud_src_file }}  
@@ -43,6 +57,7 @@
 - name: in Centos, the following config dir is symlink to /etc/nextcloud
   file: path=/etc/nextcloud
         state=directory
+  when: is_centos
 
 - name: Add autoconfig file
   template: src=autoconfig.php.j2
@@ -50,6 +65,7 @@
             owner={{ apache_user }}
             group=apache
             mode=0640
+  when: is_centos
 
 - name: Make apache owner
   file: path={{ nextcloud_prefix }}/nextcloud
@@ -86,8 +102,8 @@
 
 # Enable nextcloud by copying template to httpd config
 
+# following enables and disables
 - include: nextcloud_enabled.yml
-  when: nextcloud_enabled
 
 - name: Add nextcloud to service list
   ini_file: dest='{{ service_filelist }}'

roles/nextcloud/tasks/nextcloud_enabled.yml

@@ -11,12 +11,17 @@
             owner=root
             group=root
             mode=0644
+  when: nextcloud_enabled
+
+- name: For redhat, remove the config file
+  file: path=/etc/{{ apache_config_dir }}/nextcloud.conf
+        state=absent
 
 - name: Enable nextcloud
   file: path=/etc/apache2/sites-enabled/nextcloud.conf
         src=/etc/apache2/sites-available/nextcloud.conf
         state=link
-  when: nextcloud_enabled and is_debian
+  when: nextcloud_enabled and is_debuntu
 
 - name: Disable nextcloud
   file: path=/etc/apache2/sites-enabled/nextcloud.conf

vars/default_vars.yml

@@ -193,7 +193,7 @@ elgg_enabled: False
 elgg_mysql_password: elgg4kids
 
 # OwnCloud
-owncloud_install: True
+owncloud_install: False
 owncloud_enabled: False
 
 # WordPress