From ff8b787683692987fc42e081b48097fd609f1189 Mon Sep 17 00:00:00 2001 From: Alexis Gavoty Date: Mon, 9 Dec 2013 13:42:39 +0100 Subject: [PATCH] Update install --- scripts/install | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 2ffa1f7..83a6b09 100755 --- a/scripts/install +++ b/scripts/install @@ -4,6 +4,7 @@ domain=$1 path=$2 user=$3 +password=$4 # Check user parameter ls /home | grep $user @@ -12,6 +13,11 @@ if [[ ! $? -eq 0 ]]; then exit 1 fi +if [[ $password == "" ]]; then + echo "Wrong password" + exit 1 +fi + # Check domain/path availability sudo yunohost app checkurl $domain$path -a owncloud if [[ ! $? -eq 0 ]]; then @@ -72,12 +78,12 @@ sudo yunohost app ssowatconf # Owncloud installation via curl echo "127.0.0.1 $domain #yunoowncloud" | sudo tee -a /etc/hosts sleep 1 -curl -kL -X POST https://$domain$path/index.php --data "install=true&adminlogin=$user&adminpass=$db_pwd&directory=/home/yunohost.app/owncloud/data&dbtype=mysql&dbuser=$db_user&dbpass=$db_pwd&dbname=$db_user&dbhost=localhost" > /dev/null 2>&1 +curl -kL -X POST https://$domain$path/index.php --data "install=true&adminlogin=$user&adminpass=$password&directory=/home/yunohost.app/owncloud/data&dbtype=mysql&dbuser=$db_user&dbpass=$db_pwd&dbname=$db_user&dbhost=localhost" > /dev/null 2>&1 # Enable plugins sleep 5 -curl -kL -X POST https://$domain$path/index.php/settings/ajax/enableapp.php --data "appid=files_external" -u "$user:$db_pwd" > /dev/null 2>&1 -curl -kL -X POST https://$domain$path/index.php/settings/ajax/enableapp.php --data "appid=user_ldap" -u "$user:$db_pwd" > /dev/null 2>&1 +curl -kL -X POST https://$domain$path/index.php/settings/ajax/enableapp.php --data "appid=files_external" -u "$user:$password" > /dev/null 2>&1 +curl -kL -X POST https://$domain$path/index.php/settings/ajax/enableapp.php --data "appid=user_ldap" -u "$user:$password" > /dev/null 2>&1 # Check if the Mysql database is initialized & running mysql -u $db_user -p$db_pwd $db_user -e "select * from oc_appconfig;" > /dev/null 2>&1 -- 2.0.0