Merge pull request #18 from georgejhunt/fixes

Fixes

roles/2-common/tasks/packages.yml

@@ -76,6 +76,7 @@
    - wget
    - openssl   #FC 18 does not supply, but pear requires
    - gawk
+   - curl
   tags:
     - download
 

roles/network/tasks/debian.yml

@@ -25,7 +25,7 @@
   ignore_errors: True
 
 - name: Get the dhcp client daemon used in recent raspbian
-  package: name=dhcpcd-dbus
+  package: name=dhcpcd5
            state=present
 
 - name: for upgrades from earlier 6.2, remove br0 file

roles/nextcloud/tasks/main.yml

@@ -17,7 +17,7 @@
     - download
 
 - name: Install list of packages for debuntu
-  apt: name={{ item }} state=installed
+  package: name={{ item }} state=present
   with_items:   
     - libapache2-mod-php5
     - php{{ php_version }}-gd
@@ -30,16 +30,17 @@
   when: is_debuntu
      
 - name: Install list of packages  
-  apt: name={{ item }} state=installed
+  package: name={{ item }} state=present
   with_items:   
-    - libapache2-mod-php5
+    - php
     - php-gd
     - php-json
     - php-mysql
     - php-curl
     - php-intl
     - php-mcrypt
-    - php-imagick
+# centos does not have a package for php-imagick
+#    - php-imagick
   when: is_redhat
      
 - name: Copy it to permanent location /opt

roles/nextcloud/tasks/nextcloud_enabled.yml

@@ -29,6 +29,7 @@
 
 - name: Run nextcloud initial install wizard
   shell: curl http://{{ xsce_hostname }}{{ nextcloud_url }}/index.php
+  when: nextcloud_enabled
 
 - name: Remove Rewrite URL
   lineinfile: regexp='overwrite.cli.url'

vars/Debian.yml

@@ -5,7 +5,6 @@ dns_user: bind
 proxy: squid3
 proxy_user: proxy
 apache_service: apache2
-apache_user: apache
 apache_config_dir: apache2/sites-available
 apache_data: www-data
 apache_log_dir: /var/log/apache2