From 18e6ac296d0e6db25722a5efd963c256da995141 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 19 Apr 2018 23:52:52 +0200 Subject: [PATCH 1/4] prepare upgrade to 13.0.2 Signed-off-by: Arthur Schiwon --- Dockerfile | 2 +- Makefile | 2 +- setup | 32 +++++++++++--------------------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 92af620..b7d0a6c 100644 --- a/Dockerfile +++ b/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.2RC1.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/ diff --git a/Makefile b/Makefile index d880906..227e808 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # along with this program. If not, see . app_name=nextcloud -app_version=12.0.6-0 +app_version=13.0.1-90 ucs_version=4.1 diff --git a/setup b/setup index a412412..78a55f1 100644 --- a/setup +++ b/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 - 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 From 9235c9314de127dfca145fcf8c939ba9d8d130f1 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 20 Apr 2018 00:03:30 +0200 Subject: [PATCH 2/4] dockerimage can be set per script now \o/ --- Makefile | 2 ++ README.md | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 227e808..a0f35ed 100644 --- a/Makefile +++ b/Makefile @@ -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: diff --git a/README.md b/README.md index 040f86c..b8219a7 100644 --- a/README.md +++ b/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 :) From 976998599550f70c556332b83f499d603e1784aa Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 20 Apr 2018 13:17:24 +0200 Subject: [PATCH 3/4] use mail as LDAP mail attribute instead of mailPrimaryAddress Signed-off-by: Arthur Schiwon --- inst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst b/inst index ab24d8f..d1cff9e 100644 --- a/inst +++ b/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" From 299e1906a8d1a40e7d32d02d1018c84c9fff0790 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 27 Apr 2018 13:33:32 +0200 Subject: [PATCH 4/4] 13.0.2 final Signed-off-by: Arthur Schiwon --- Dockerfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b7d0a6c..a30f93c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ FROM ubuntu:16.04 -ADD https://download.nextcloud.com/server/prereleases/nextcloud-13.0.2RC1.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/ diff --git a/Makefile b/Makefile index a0f35ed..24f8718 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # along with this program. If not, see . app_name=nextcloud -app_version=13.0.1-90 +app_version=13.0.2-0 ucs_version=4.1