Merge pull request #52 from nextcloud/prepare-13.0.2

Prepare 13.0.2

Dockerfile

@@ -21,7 +21,7 @@
 
 FROM ubuntu:16.04
 
-ADD https://download.nextcloud.com/server/prereleases/nextcloud-12.0.6.tar.bz2 /root/nextcloud.tar.bz2
+ADD https://download.nextcloud.com/server/prereleases/nextcloud-13.0.2.tar.bz2 /root/nextcloud.tar.bz2
 COPY resources/entrypoint.sh /usr/sbin/
 COPY resources/60-nextcloud.ini /etc/php/7.0/apache2/conf.d/
 COPY resources/60-nextcloud.ini /etc/php/7.0/cli/conf.d/

Makefile

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 app_name=nextcloud
-app_version=12.0.6-0
+app_version=13.0.2-0
 
 ucs_version=4.1
 
@@ -51,6 +51,8 @@ push-files:
 		i18n/de/README_INSTALL_DE \
 		i18n/en/README_UNINSTALL_EN \
 		i18n/de/README_UNINSTALL_DE
+	univention-appcenter-control set --noninteractive $(app_name)=$(app_version) \
+		--json '{"DockerImage": "nextcloud/univention-app-image:$(app_version)"}'
 
 .PHONY: docker
 docker:

README.md

@@ -221,5 +221,4 @@ This is essentially ``make push-files && make docker``
 
 Afterwards, there are still two things that need to be done in the Provider Portal:
 
-1. Adjust the docker image according to the release version
-2. Press the Publish button :)
+1. Press the Publish button :)

inst

@@ -135,7 +135,7 @@ nextcloud_configure_ldap_backend() {
     data+="&configData[ldapGroupFilterObjectclass]=nextcloudGroup"
     data+="&configData[ldapUserDisplayName]="`nextcloud_urlEncode "$nextcloud_ldap_userDisplayName"`
     data+="&configData[ldapGroupDisplayName]="`nextcloud_urlEncode "$nextcloud_ldap_groupDisplayName"`
-    data+="&configData[ldapEmailAttribute]=mailPrimaryAddress"
+    data+="&configData[ldapEmailAttribute]=mail"
     data+="&configData[ldapQuotaAttribute]=nextcloudQuota"
     data+="&configData[homeFolderNamingRule]="`nextcloud_urlEncode "$nextcloud_ldap_homeFolderAttribute"`
     data+="&configData[ldapGroupMemberAssocAttr]=uniqueMember"

setup

@@ -99,27 +99,16 @@ if [ "$NC_IS_UPGRADE" -eq 0 ] ; then
     done
 
     if [ "$NC_APPLIANCE" = true ]; then
-        # Heads up: in Nc 13 we will have occ app:install <appid>
-        EXTRA_APP_URLS=(\
-            https://github.com/nextcloud/zenodo/releases/download/v0.9.4/zenodo-0.9.4.tar.gz \
-            https://github.com/nextcloud/dashboard/releases/download/v4.0.6/dashboard-4.0.6.tar.gz \
-            https://github.com/nextcloud/circles/releases/download/v0.13.6/circles-0.13.6.tar.gz \
-            https://github.com/nextcloud/groupfolders/releases/download/v1.2.0/groupfolders-1.2.0.tar.gz \
-            https://github.com/nextcloud/announcementcenter/releases/download/v3.1.1/announcementcenter-3.1.1.tar.gz \
-            https://github.com/nextcloud/admin_notifications/releases/download/v1.0.1/admin_notifications-1.0.1.tar.gz \
-            https://github.com/nextcloud/quota_warning/releases/download/v1.1.1/quota_warning-1.1.1.tar.gz \
-            https://download.nextcloud.com/server/apps/orcid-0.9.1.tar.gz \
-            https://github.com/nextcloud/user_saml/releases/download/v1.4.2/user_saml-1.4.2.tar.gz \
-        )
-
-        cd apps
-        for APP_URL in "${EXTRA_APP_URLS[@]}" ; do
-            wget "$APP_URL" -O app.tar.gz && \
-            tar -xf app.tar.gz
-            rm app.tar.gz
-        done
-        chown -R www-data:nogroup *
-        cd ..
+        # install extra apps
+        $OCC app:install zenodo
+        $OCC app:install dashboard
+        $OCC app:install circles
+        $OCC app:install groupfolders
+        $OCC app:install announcementcenter
+        $OCC app:install admin_notifications
+        $OCC app:install quota_warning
+        $OCC app:install orcid
+        $OCC app:install user_saml
 
         # enable extra apps
         $OCC app:enable zenodo
@@ -131,6 +120,7 @@ if [ "$NC_IS_UPGRADE" -eq 0 ] ; then
         $OCC app:enable quota_warning
         $OCC app:enable orcid
         $OCC app:enable user_saml
+
         # ensure they are the latest version
         $OCC upgrade 2>&1>> "$UPGRADE_LOGFILE"
     fi