mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-03 20:10:19 +01:00
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:
parent
1811fd29c6
commit
414095b5f8
@ -40,17 +40,20 @@ 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
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -n "$DOCKER_HOST_NAME" -a -n "$DB_HOST" ]
|
if [ -n "$DOCKER_HOST_NAME" -a -n "$DB_HOST" ]
|
||||||
then
|
then
|
||||||
# docker UCS setup, use appcenter join script
|
# docker UCS setup, use appcenter join script
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
|
if test -f /etc/lsb-release && grep -q '^DISTRIB_ID="*Univention"*$' /etc/lsb-release
|
||||||
|
then
|
||||||
# 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
|
else
|
||||||
# for non-interactive install let post_install generate passwords
|
# for non-interactive install let post_install generate passwords
|
||||||
if [ "$DEBIAN_FRONTEND" = "noninteractive" ]
|
if [ "$DEBIAN_FRONTEND" = "noninteractive" ]
|
||||||
@ -91,6 +94,7 @@ then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
echo "EGroupware install log saved to $install_log"
|
echo "EGroupware install log saved to $install_log"
|
||||||
|
|
||||||
# Only change permissions during initial installation, in case
|
# Only change permissions during initial installation, in case
|
||||||
|
Loading…
Reference in New Issue
Block a user