change debian.postinst to NOT run post_install.php, if $DOCKER_HOST_NAME and $DB_HOST is non-empty

like we already did that for Univention Docker installation
This commit is contained in:
Ralf Becker 2018-10-10 10:46:42 +02:00
parent 1811fd29c6
commit 414095b5f8

View File

@ -40,54 +40,58 @@ then
if test -f /etc/lsb-release && grep -q '^DISTRIB_ID="*Univention"*$' /etc/lsb-release if test -f /etc/lsb-release && grep -q '^DISTRIB_ID="*Univention"*$' /etc/lsb-release
then then
apache_conf=apache-univention.conf apache_conf=apache-univention.conf
if [ -n "$DOCKER_HOST_NAME" -a -n "$DB_HOST" ] fi
if [ -n "$DOCKER_HOST_NAME" -a -n "$DB_HOST" ]
then
# docker UCS setup, use appcenter join script
:
else
if test -f /etc/lsb-release && grep -q '^DISTRIB_ID="*Univention"*$' /etc/lsb-release
then then
# docker UCS setup, use appcenter join script
:
else
# normal UCS setup # normal UCS setup
/usr/share/egroupware/doc/rpm-build/post_install.php \ /usr/share/egroupware/doc/rpm-build/post_install.php \
--distro univention \ --distro univention \
--admin_user "Administrator" \ --admin_user "Administrator" \
--admin_passwd "*unchanged*" 2>&1 | /usr/bin/tee -a $install_log --admin_passwd "*unchanged*" 2>&1 | /usr/bin/tee -a $install_log
fi
else
# for non-interactive install let post_install generate passwords
if [ "$DEBIAN_FRONTEND" = "noninteractive" ]
then
/usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log
else else
# Get configuration passwords # for non-interactive install let post_install generate passwords
db_get "egroupware/header/user" if [ "$DEBIAN_FRONTEND" = "noninteractive" ]
header_user="$RET" then
db_get "egroupware/header/password" /usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log
header_password="$RET" else
# Get configuration passwords
db_get "egroupware/header/user"
header_user="$RET"
db_get "egroupware/header/password"
header_password="$RET"
# Get first egroupware user / pw # Get first egroupware user / pw
db_get "egroupware/admin/user" db_get "egroupware/admin/user"
admin_user="$RET" admin_user="$RET"
db_get "egroupware/admin/password" db_get "egroupware/admin/password"
admin_password="$RET" admin_password="$RET"
# Get egroupware language # Get egroupware language
db_get "egroupware/lang" db_get "egroupware/lang"
lang="$RET" lang="$RET"
# Get mysql root / pw # Get mysql root / pw
db_get "egroupware/db_root" db_get "egroupware/db_root"
db_root="$RET" db_root="$RET"
db_get "egroupware/db_root_pw" db_get "egroupware/db_root_pw"
db_root_pw="$RET" db_root_pw="$RET"
/usr/share/egroupware/doc/rpm-build/post_install.php \ /usr/share/egroupware/doc/rpm-build/post_install.php \
--config_user "$header_user" \ --config_user "$header_user" \
--config_passwd "$header_password" \ --config_passwd "$header_password" \
--admin_user "$admin_user" \ --admin_user "$admin_user" \
--admin_passwd "$admin_password" \ --admin_passwd "$admin_password" \
--lang "$lang" \ --lang "$lang" \
--db_type mysql \ --db_type mysql \
--db_root "$db_root" \ --db_root "$db_root" \
--db_root_pw "$db_root_pw" 2>&1 | /usr/bin/tee -a $install_log --db_root_pw "$db_root_pw" 2>&1 | /usr/bin/tee -a $install_log
fi
fi fi
fi fi
fi fi