From 246a98472f73017d85590ed20640a0182639ae83 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Sun, 12 Nov 2017 15:30:27 +0000
Subject: [PATCH] change download code

---
 defaults/main.yml | 15 ++++++---------
 tasks/apps.yml    |  4 ++--
 tasks/server.yml  |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 544570e..d5a15b8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,25 +5,22 @@ nextcloud_directory: /var/www/nextcloud
 nextcloud_data_directory: "{{nextcloud_directory}}/data"
 
 nextcloud_server_version: 12.0.3
-nextcloud_server_sha256sum: 88bcaccba886d0e5a145b15fe216d652ab68a0a4c089a102f1fa1e78e6ddfb71
+nextcloud_server_checksum: sha256:88bcaccba886d0e5a145b15fe216d652ab68a0a4c089a102f1fa1e78e6ddfb71
 
 nextcloud_apps:
   - name: contacts
     version: 2.0.1
-    url: https://github.com/nextcloud/contacts/releases/download/v2.0.1/contacts.tar.gz
-    sha256sum: ce17a7dde519698abb86be987d803913222c6691bf297a1082001344031fd2d9
+    checksum: sha256:ce17a7dde519698abb86be987d803913222c6691bf297a1082001344031fd2d9
   - name: calendar
-    version: 1.5.5
-    url: https://download.nextcloud.com/server/apps/calendar-1.5.5.tar.gz
-    sha256sum: 9a809307a3bf7e92e1dc5d39339f97d68fa1bd72a39206191ad1a3862bb778ed
+    version: 1.5.6
+    checksum: sha256:afe77c960e0a67a41452b1183495ce327beea1b35f04eaf48c71706af9e81358
   - name: tasks
     version: 0.9.5
-    url: https://github.com/nextcloud/tasks/releases/download/v0.9.5/tasks.tar.gz
-    sha256sum: a76ab499668510d0364262f787520e8f030974facbbe5f0b9ec8ea11915579c9
+    checksum: sha256:a76ab499668510d0364262f787520e8f030974facbbe5f0b9ec8ea11915579c9
   - name: news
     version: 11.0.5
     url: https://github.com/nextcloud/news/releases/download/11.0.5/news.tar.gz
-    sha256sum: 664acc326821d8e15be4f26d4e69033bf01286f255f6e1224c0048d1842e5617
+    checksum: sha256:664acc326821d8e15be4f26d4e69033bf01286f255f6e1224c0048d1842e5617
 
 nextcloud_default_language: en
 nextcloud_force_language: false
diff --git a/tasks/apps.yml b/tasks/apps.yml
index 7c5e44b..f217fd0 100644
--- a/tasks/apps.yml
+++ b/tasks/apps.yml
@@ -2,9 +2,9 @@
 
 - name: nextcloud apps download
   get_url:
-    url: "{{ item.url }}"
+    url: "{{ item.url | default('https://github.com/nextcloud/'+item.name+'/releases/download/v'+item.version+'/'+item.name+'.tar.gz') }}"
     dest: /var/www/nextcloud-app-{{item.name}}-{{ item.version }}.tar.gz
-    sha256sum: "{{ item.sha256sum }}"
+    checksum: "{{ item.checksum }}"
   with_items: "{{ nextcloud_apps }}"
 
 - name: nextcloud apps extract
diff --git a/tasks/server.yml b/tasks/server.yml
index fc4a881..6433ec9 100644
--- a/tasks/server.yml
+++ b/tasks/server.yml
@@ -4,7 +4,7 @@
   get_url:
     url: https://download.nextcloud.com/server/releases/nextcloud-{{ nextcloud_server_version }}.tar.bz2
     dest: /var/www/nextcloud-{{ nextcloud_server_version }}.tar.bz2
-    sha256sum: "{{ nextcloud_server_sha256sum }}"
+    checksum: "{{ nextcloud_server_checksum }}"
 
 - name: nextcloud server extract
   unarchive: