From e9b1f5bfb78b6a2f512c79a4ca4c8c2e9e3cef4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Garrigue?= Date: Fri, 21 Aug 2015 11:39:11 +0000 Subject: [PATCH] =?UTF-8?q?J'ai=20vraiment=20oubli=C3=A9=20=C3=A7a=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 904e54c..21b23f3 100755 --- a/scripts/install +++ b/scripts/install @@ -22,7 +22,7 @@ master_key=`dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0- firstname=`sudo yunohost user info $admin | grep firstname: | cut -d' ' -f2 | tr -d '\n'` lastname=`sudo yunohost user info $admin | grep lastname: | cut -d' ' -f2 | tr -d '\n'` email=`sudo yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n'` -TZ=`cat /etc/timezone | tr -d '\n'` +timezone=`cat /etc/timezone | tr -d '\n'` # Save app settings sudo yunohost app setting $app admin -v "$admin" @@ -65,8 +65,8 @@ sudo service nginx reload sudo yunohost app ssowatconf # Setting first user details and filling database calling admin/install/index.php -success=`curl -L --cacert /etc/yunohost/certs/$domain/ca.pem -F "u_email=$EMAIL" -F "u_firstname=$FIRSTNAME" -F "u_name=$NAME" -F "u_login=$LOGIN" -F "u_pwd=$admin_password" -F "u_pwd2=$admin_password" -F "u_date=$TZ" https://$domain$path/admin/install/index.php` -# success=`curl -L --cacert /etc/yunohost/certs/$domain/ca.pem -H 'Host: $domain' -X POST --data '?u_email=$EMAIL&u_firstname=$FIRSTNAME&u_name=$NAME&u_login=$LOGIN&u_pwd=$admin_password&u_pwd2=$admin_password&u_date=$TZ' https://$domain$path/admin/install/index.php` +success=`curl -L --cacert /etc/yunohost/certs/$domain/ca.pem -F "u_email=$email" -F "u_firstname=$firstname" -F "u_name=$lastname" -F "u_login=$admin" -F "u_pwd=$admin_password" -F "u_pwd2=$admin_password" -F "u_date=$timezone" https://$domain$path/admin/install/index.php` +# success=`curl -L --cacert /etc/yunohost/certs/$domain/ca.pem -H 'Host: $domain' -X POST --data '?u_email=$EMAIL&u_firstname=$FIRSTNAME&u_name=$NAME&u_login=$LOGIN&u_pwd=$admin_password&u_pwd2=$admin_password&u_date=$timezone' https://$domain$path/admin/install/index.php` # Success or not success if [ `echo $success | grep -c success` -gt 0 ]