diff --git a/debconf b/debconf index f555847..4244f2b 100644 --- a/debconf +++ b/debconf @@ -1,14 +1,14 @@ postfix postfix/main_mailer_type select Internet Site postfix postfix/mailname string /etc/mailname -mysql-server-5.1 mysql-server/root_password password -mysql-server-5.1 mysql-server/root_password_again password +mysql-server-5.1 mysql-server/root_password password +mysql-server-5.1 mysql-server/root_password_again password samba-common samba-common/workgroup string WORKGROUP samba-common samba-common/workgroup boolean true -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 +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 proftpd-basic shared/proftpd/inetd_or_standalone select standalone libnss-ldapd libnss-ldapd/nsswitch multiselect group, passwd, shadow diff --git a/install_yunohost b/install_yunohost index 15d857c..33cf1da 100755 --- a/install_yunohost +++ b/install_yunohost @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x echo "YunoHost Installation" echo "Do you want install Yunhost? (Y/n)" @@ -29,10 +29,10 @@ then grep "yunohost" /etc/apt/sources.list if [ $? = 1 ]; then - if [ $(lsb_release -cs) = "Debian" ]; + if [ $(lsb_release -is) = "Debian" ]; then echo "deb http://repo.yunohost.org/ squeeze main" >> /etc/apt/sources.list - elif [ $(lsb_release -cs) = "Ubuntu" ]; + elif [ $(lsb_release -is) = "Ubuntu" ]; then echo "deb http://repo.yunohost.org/ precise main" >> /etc/apt/sources.list fi @@ -48,11 +48,11 @@ then echo "======== Install ========" #add answer in debconf db - wget https://raw.github.com/YunoHost/Script/master/debconf --no-check-certificate + #wget https://raw.github.com/YunoHost/Script/master/debconf --no-check-certificate debconf-set-selections debconf #Install yunohost packages - apt-get install yunohost yunohost-config yunohost-config-postfix postfix postfix-ldap postfix-policyd-spf-perl + apt-get install yunohost yunohost-config yunohost-config-postfix postfix postfix-ldap postfix-policyd-spf-perl -y if [ $? != 0 ] ; then echo "Install yunohost Failure"