Merge pull request #16 from julienmalik/master

Some fixes
This commit is contained in:
abeudin 2014-08-18 14:21:51 +02:00
commit 34893469a0
2 changed files with 27 additions and 18 deletions

View file

@ -4,17 +4,12 @@ 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.1 mysql-server/root_password password yunohost
mysql-server-5.1 mysql-server/root_password_again password yunohost
samba-common samba-common/workgroup string WORKGROUP
samba-common samba-common/workgroup boolean true
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
proftpd-basic shared/proftpd/inetd_or_standalone select standalone
iptables-persistent iptables-persistent/autosave_v6 boolean false
iptables-persistent iptables-persistent/autosave_v4 boolean false
libnss-ldapd libnss-ldapd/nsswitch multiselect group, passwd, shadow

View file

@ -21,6 +21,20 @@ function rst {
}
set -u
echo "======== Get path of current script ======="
# http://stackoverflow.com/questions/59895/can-a-bash-script-tell-what-directory-its-stored-in
SOURCE="${BASH_SOURCE[0]}"
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
echo "Running from $DIR"
echo "======== Check rights ========"
if [ "$(id -u)" != "0" ]; then
@ -118,7 +132,7 @@ then
echo "======== Install ========"
#add answer in debconf db
debconf-set-selections debconfv2
debconf-set-selections $DIR/debconfv2
#Install yunohost packages
debconf-apt-progress \