Revert "[enh] Use the new stable repository"

This reverts commit 5f1fd14f07,
since it is not ready yet for a stable release.
This commit is contained in:
Jérôme Lebleu 2015-11-17 11:50:08 +01:00
parent 5f1fd14f07
commit 0867ae2419

View file

@ -103,8 +103,34 @@ installscript_dependencies() {
} }
create_custom_config() { create_custom_config() {
mkdir -p /etc/yunohost/ if [[ "$DISTRIB" != "daily" ]] && [[ "$DISTRIB" != "unstable" ]] \
touch /etc/yunohost/from_script && [[ "$DISTRIB" != "test" ]] && [[ "$DISTRIB" != "testing" ]] ; then
if [[ ! -f /etc/yunohost/yunohost.conf ]]
then
mkdir -p /etc/yunohost/
touch /etc/yunohost/from_script
cat << EOF > /etc/yunohost/yunohost.conf
# Yunohost custom config
# If you want to keep a custom service configuration replace "no" by "yes"
# for the concerned service
amavis=no
avahi=no
dovecot=no
iptables=no
metronome=no
mysql=no
nginx=no
postfix=no
slapd=no
ssh=yes
ssowat=no
EOF
fi
else
mkdir -p /etc/yunohost/
touch /etc/yunohost/from_script
fi
} }
set_domain() { set_domain() {
@ -138,14 +164,15 @@ Are you sure you want to proceed with the installation of Yunohost?
setup_package_source() { setup_package_source() {
local CUSTOMAPT=/etc/apt/sources.list.d/yunohost.list local CUSTOMAPT=/etc/apt/sources.list.d/yunohost.list
if [[ "$DISTRIB" == "megusta" ]] || [[ "$DISTRIB" == "stable" ]] ; then # In any case we need the main stable repo
echo "deb http://repo.yunohost.org/debian jessie stable" > $CUSTOMAPT echo "deb http://repo.yunohost.org/ megusta main" > $CUSTOMAPT
fi
# Also add repositories for 'testing' and/or 'unstable' if the script has been called with those arguments
if [[ "$DISTRIB" == "test" ]] || [[ "$DISTRIB" == "testing" ]] ; then if [[ "$DISTRIB" == "test" ]] || [[ "$DISTRIB" == "testing" ]] ; then
echo "deb http://repo.yunohost.org/debian jessie testing" > $CUSTOMAPT echo "deb http://repo.yunohost.org/debian stable testing" >> $CUSTOMAPT
fi fi
if [[ "$DISTRIB" == "daily" ]] || [[ "$DISTRIB" == "unstable" ]] ; then if [[ "$DISTRIB" == "daily" ]] || [[ "$DISTRIB" == "unstable" ]] ; then
echo "deb http://repo.yunohost.org/debian jessie testing unstable" > $CUSTOMAPT echo "deb http://repo.yunohost.org/debian stable testing unstable" > $CUSTOMAPT
fi fi
# Add YunoHost repository key to the keyring # Add YunoHost repository key to the keyring
@ -157,7 +184,9 @@ apt_update() {
} }
register_debconf() { register_debconf() {
debconf-set-selections << EOF if [[ $(lsb_release -c | awk '{print $2}') == jessie ]];
then
debconf-set-selections << EOF
slapd slapd/password1 password yunohost slapd slapd/password1 password yunohost
slapd slapd/password2 password yunohost slapd slapd/password2 password yunohost
slapd slapd/domain string yunohost.org slapd slapd/domain string yunohost.org
@ -177,6 +206,25 @@ nslcd nslcd/ldap-binddn string
nslcd nslcd/ldap-base string dc=yunohost,dc=org nslcd nslcd/ldap-base string dc=yunohost,dc=org
libnss-ldapd libnss-ldapd/nsswitch multiselect group, passwd, shadow libnss-ldapd libnss-ldapd/nsswitch multiselect group, passwd, shadow
EOF EOF
else
debconf-set-selections << EOF
slapd slapd/password1 password yunohost
slapd slapd/password2 password yunohost
slapd slapd/domain string yunohost.org
slapd shared/organization string yunohost.org
postfix postfix/main_mailer_type select Internet Site
postfix postfix/mailname string /etc/mailname
mysql-server-5.5 mysql-server/root_password password yunohost
mysql-server-5.5 mysql-server/root_password_again password yunohost
nslcd nslcd/ldap-bindpw password
nslcd nslcd/ldap-starttls boolean false
nslcd nslcd/ldap-reqcert select
nslcd nslcd/ldap-uris string ldap://localhost/
nslcd nslcd/ldap-binddn string
nslcd nslcd/ldap-base string dc=yunohost,dc=org
libnss-ldapd libnss-ldapd/nsswitch multiselect group, passwd, shadow
EOF
fi
} }
workaround_avahi_installation() { workaround_avahi_installation() {
@ -220,10 +268,21 @@ workaround_avahi_installation() {
} }
install_yunohost_packages() { install_yunohost_packages() {
apt_get_wrapper \ if [[ "$DISTRIB" != "daily" ]] && [[ "$DISTRIB" != "unstable" ]] \
-o Dpkg::Options::="--force-confold" \ && [[ "$DISTRIB" != "test" ]] && [[ "$DISTRIB" != "testing" ]] ; then
-y --force-yes install \ apt_get_wrapper \
yunohost postfix -o Dpkg::Options::="--force-confold" \
-y --force-yes install \
yunohost yunohost-config \
yunohost-config-postfix \
postfix postfix-ldap \
postfix-policyd-spf-perl
else
apt_get_wrapper \
-o Dpkg::Options::="--force-confold" \
-y --force-yes install \
yunohost postfix
fi
} }
restart_services() { restart_services() {