From 87b955142dd2a5fcb2eb0d6a986a0cc797bc99fd Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 18 Jan 2017 09:30:05 +0100 Subject: [PATCH] added docker UCS setup using appcenter join script --- doc/rpm-build/debian.postinst | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/rpm-build/debian.postinst b/doc/rpm-build/debian.postinst index 66e450dc35..84314e2465 100644 --- a/doc/rpm-build/debian.postinst +++ b/doc/rpm-build/debian.postinst @@ -34,10 +34,17 @@ then else if grep -q '^DISTRIB_ID="*Univention"*$' /etc/lsb-release then - /usr/share/egroupware/doc/rpm-build/post_install.php \ - --distro univention \ - --admin_user "Administrator" \ - --admin_passwd "*unchanged*" 2>&1 | /usr/bin/tee -a $install_log + if [ -n "$DOCKER_HOST_NAME" -a -n "$DB_HOST" ] + then + # docker UCS setup, use appcenter join script + : + else + # normal UCS setup + /usr/share/egroupware/doc/rpm-build/post_install.php \ + --distro univention \ + --admin_user "Administrator" \ + --admin_passwd "*unchanged*" 2>&1 | /usr/bin/tee -a $install_log + fi else # Get configuration passwords db_get "egroupware/header/user" @@ -67,6 +74,7 @@ then --admin_user "$admin_user" \ --admin_passwd "$admin_password" \ --lang "$lang" \ + --db_type mysql \ --db_root "$db_root" \ --db_root_pw "$db_root_pw" 2>&1 | /usr/bin/tee -a $install_log fi