From 1dedccf6268f167aedd70396cbb15bff0610f3a3 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Mon, 19 Jun 2017 19:06:50 -0700
Subject: [PATCH] nextcloud repo errors ubuntu<->debian, dokuwiki changes

---
 roles/dokuwiki/defaults/main.yml |  2 +-
 roles/dokuwiki/tasks/install.yml |  6 +++---
 roles/nextcloud/tasks/main.yml   | 19 +++++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/roles/dokuwiki/defaults/main.yml b/roles/dokuwiki/defaults/main.yml
index b038f0208..8696a415c 100644
--- a/roles/dokuwiki/defaults/main.yml
+++ b/roles/dokuwiki/defaults/main.yml
@@ -1,4 +1,4 @@
 dokuwiki_url: /wiki
 dokuwiki_install: True
 dokuwiki_enabled: False
-dokuwiki_version: "dokuwiki-2014-09-29.tgz"
+dokuwiki_version: "dokuwiki-2014-09-29"
diff --git a/roles/dokuwiki/tasks/install.yml b/roles/dokuwiki/tasks/install.yml
index 135c9c127..2e4c320ab 100644
--- a/roles/dokuwiki/tasks/install.yml
+++ b/roles/dokuwiki/tasks/install.yml
@@ -1,11 +1,11 @@
 - name: Get the Dokuwiki software
-  get_url: url="{{ iiab_download_url }}/{{ dokuwiki_version }}"  dest={{ downloads_dir}}/
+  get_url: url="{{ iiab_download_url }}/{{ dokuwiki_version }}.tgz"  dest={{ downloads_dir}}/
   when: not {{ use_cache }} and not {{ no_network }}
   tags:
     - download2
 
 - name: Copy it to permanent location /library
-  unarchive: src={{ downloads_dir }}/{{ dokuwiki_version }}  dest=/library creates=/library/{{ dokuwiki_version }}/VERSION
+  unarchive: src={{ downloads_dir }}/{{ dokuwiki_version }}.tgz  dest=/library creates=/library/{{ dokuwiki_version }}/VERSION
 
 - name: Symlink /library/dokuwiki* to /library/dokuwiki
   shell: if [ ! -d /library/dokuwiki ]; then ln -sf /library/{{ dokuwiki_version }} /library/dokuwiki; fi
@@ -27,7 +27,7 @@
 
 
 - name: Change permissions on engine directory so apache can write
-  file: path=/library/dokuwiki owner={{ apache_user }} mode=0755 state=directory recurse=yes
+  file: path=/library/{{ dokuwiki_version }} owner={{ apache_user }} mode=0755 state=directory recurse=yes
 
 - name: Restart apache, so it picks up the new aliases
   service: name={{ apache_service }} state=restarted
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 839ed9158..66b07b271 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -16,19 +16,30 @@
   tags:
     - download
 
-- name: Install list of packages for debuntu
+- name: ubuntu and debian treat names differently
+  package: name={{ item }} state=present
+  with_items:   
+    - libapache2-mod-php5
+  when: is_debian
+
+- name: ubuntu and debian treat names differently
   package: name={{ item }} state=present
   with_items:   
     - libapache2-mod-php
+    - php-imagick
+    - php-zip
+    - php-mbstring
+  when: is_ubuntu
+
+- name: Install list of packages for debuntu
+  package: name={{ item }} state=present
+  with_items:   
     - 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-imagick
-    - php-zip
-    - php-mbstring
   when: is_debuntu
      
 - name: Install list of packages