From 9fe342c44256cf825aa607591ee64edffa366edc Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@gmail.com>
Date: Fri, 15 Aug 2014 15:42:57 +0200
Subject: [PATCH 1/2] [fix] allow running install script from anywhere. fixes
 #6

---
 install_yunohostv2 | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/install_yunohostv2 b/install_yunohostv2
index b8e90ae..ab30ca1 100755
--- a/install_yunohostv2
+++ b/install_yunohostv2
@@ -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
@@ -91,14 +105,14 @@ then
 		echo "deb http://repo.yunohost.org/ megusta main" >> $CUSTOMAPT
 	fi
 
-    if [ $# -gt 0 ]; then
-        if [[ "$1" == "test" ]]; then
-            grep -qri "test" $CUSTOMAPT
-            if [ $# -eq 1 ]; then
-                echo "deb http://repo.yunohost.org/ test main" >> $CUSTOMAPT
-            fi
-        fi
-    fi
+	if [ $# -gt 0 ]; then
+		if [[ "$1" == "test" ]]; then
+			grep -qri "test" $CUSTOMAPT
+			if [ $# -eq 1 ]; then
+				echo "deb http://repo.yunohost.org/ test main" >> $CUSTOMAPT
+			fi
+		fi
+	fi
 
         #Get gpg key
         wget -O- http://repo.yunohost.org/yunohost.asc -q | apt-key add - -qq
@@ -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 \
@@ -147,7 +161,7 @@ then
 
 		echo -e "\n"
 		whiptail --title "Post-installation" --yesno "Proceed to post-installation?" 8 78
-        YESNO=$?
+		YESNO=$?
 		RESULT=1
 		while [ $RESULT -gt 0 ]; do
 			if [[ $YESNO -eq 0 ]]; then
@@ -157,7 +171,7 @@ then
 				if [ $RESULT -gt 0 ]; then
 					echo -e "\n"
 					whiptail --title "Post-installation" --yesno "Post-installation failed, retry ?" 8 78
-                    let YESNO=$?
+					let YESNO=$?
 				fi
 			else
 				exit 0

From 4dd2b20cd89b12eedc9ce62aad14a8d9641e7255 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@gmail.com>
Date: Fri, 15 Aug 2014 15:45:33 +0200
Subject: [PATCH 2/2] [fix] update debconfv2. fixes #15

---
 debconfv2 | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/debconfv2 b/debconfv2
index efda977..6b0bfb9 100644
--- a/debconfv2
+++ b/debconfv2
@@ -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