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

[enh] Do not install extra packages and configurations on unstable

Browse source
This commit is contained in:
kload 2015-10-02 07:25:24 -04:00
parent 3be443a2ca
commit 6ed01f443d
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
install_yunohostv2
View file

@ -103,9 +103,10 @@ installscript_dependencies() {
} }
create_custom_config() { create_custom_config() {
if [[ "$DISTRIB" != "daily" ]] && [[ "$DISTRIB" != "unstable" ]] ; then
if [[ ! -f /etc/yunohost/yunohost.conf ]] if [[ ! -f /etc/yunohost/yunohost.conf ]]
then then
mkdir /etc/yunohost/ mkdir -p /etc/yunohost/
touch /etc/yunohost/from_script touch /etc/yunohost/from_script
cat << EOF > /etc/yunohost/yunohost.conf cat << EOF > /etc/yunohost/yunohost.conf
# Yunohost custom config # Yunohost custom config
@ -125,6 +126,10 @@ ssh=yes
ssowat=no ssowat=no
EOF EOF
fi fi
else
mkdir -p /etc/yunohost/
touch /etc/yunohost/from_script
fi
} }
set_domain() { set_domain() {
@ -263,6 +268,7 @@ workaround_avahi_installation() {
} }
install_yunohost_packages() { install_yunohost_packages() {
if [[ "$DISTRIB" != "daily" ]] && [[ "$DISTRIB" != "unstable" ]] ; then
apt_get_wrapper \ apt_get_wrapper \
-o Dpkg::Options::="--force-confold" \ -o Dpkg::Options::="--force-confold" \
-y --force-yes install \ -y --force-yes install \
@ -270,6 +276,14 @@ install_yunohost_packages() {
yunohost-config-postfix \ yunohost-config-postfix \
postfix postfix-ldap \ postfix postfix-ldap \
postfix-policyd-spf-perl postfix-policyd-spf-perl
else
apt_get_wrapper \
-o Dpkg::Options::="--force-confold" \
-y --force-yes install \
yunohost \
postfix postfix-ldap \
postfix-policyd-spf-perl
fi
} }
restart_services() { restart_services() {