YunoHost/install_script
1
0
Fork 0
mirror of https://github.com/YunoHost/install_script.git synced 2024-09-03 20:06:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Set FQDN if possible to avoid amavisd installation error

Browse source
This commit is contained in:
kload 2015-09-29 12:53:52 -04:00
parent c2dbb333ae
commit 3be443a2ca
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
install_yunohostv2
View file

@ -120,7 +120,6 @@ metronome=no
mysql=no mysql=no
nginx=no nginx=no
postfix=no postfix=no
samba=no
slapd=no slapd=no
ssh=yes ssh=yes
ssowat=no ssowat=no
@ -128,6 +127,15 @@ EOF
fi fi
} }
set_domain() {
dpkg -l | grep amavisd-new | grep -e "^ii" > /dev/null 2>&1 \
|| [[ "$(hostname -d 2>/dev/null)" != "" ]] \
|| hostname yunohost.yunohost.org > /dev/null 2>&1 \
|| (echo "Unable to set an fully-qualified domain name to this \
container, amavisd installation will fail. Please set a fqdn \
manually before launching the installation." && exit 1)
}
confirm_installation() { confirm_installation() {
[[ "$AUTOMODE" == "1" ]] && return 0 [[ "$AUTOMODE" == "1" ]] && return 0
@ -382,36 +390,40 @@ if ! step create_custom_config ; then
die "Creating custom configuration file /etc/yunohost/yunohost.conf failed" 4 die "Creating custom configuration file /etc/yunohost/yunohost.conf failed" 4
fi fi
if ! step set_domain ; then
die "Setting hostname failed" 5
fi
if ! step confirm_installation ; then if ! step confirm_installation ; then
die "Installation cancelled at your request" 5 die "Installation cancelled at your request" 6
fi fi
if ! step setup_package_source ; then if ! step setup_package_source ; then
die "Setting up deb package sources failed" 6 die "Setting up deb package sources failed" 7
fi fi
if ! step apt_update ; then if ! step apt_update ; then
die "Error caught during 'apt-get update'" 7 die "Error caught during 'apt-get update'" 8
fi fi
if ! step register_debconf ; then if ! step register_debconf ; then
die "Unable to insert new values into debconf database" 8 die "Unable to insert new values into debconf database" 9
fi fi
if ! step workaround_avahi_installation ; then if ! step workaround_avahi_installation ; then
die "Unable to install workaround for avahi installation" 9 die "Unable to install workaround for avahi installation" 10
fi fi
if ! step install_yunohost_packages ; then if ! step install_yunohost_packages ; then
die "Installation of Yunohost packages failed" 10 die "Installation of Yunohost packages failed" 11
fi fi
if ! step restart_services ; then if ! step restart_services ; then
die "Error caught during services restart" 11 die "Error caught during services restart" 12
fi fi
if ! step post_install ; then if ! step post_install ; then
die "Post-installation failed" 12 die "Post-installation failed" 13
fi fi
# Success ! # Success !