diff --git a/scripts/install b/scripts/install index 3697179..9af6f89 100644 --- a/scripts/install +++ b/scripts/install @@ -9,13 +9,24 @@ source /usr/share/yunohost/helpers # retrieve arguments app=bozon domain=$1 -path=${2%/} +path=$2 is_public=$3 language=$4 filesize=$5 admin=$6 password=$7 + +# chech if / is present at start and not at end +if [ "${path:0:1}" != "/" ] && [ ${#path} -gt 0 ]; then + # first char is not / && path not empty => add / at start + path="/$path" +fi +if [ "${path:${#path}-1}" == "/" ] && [ ${#path} -gt 1 ]; then + # last char is / && path is gretter than / + path="${path:0:${#path}-1}" +fi + # definie useful vars parent_path=/var/www final_path="$parent_path"/"$app" @@ -93,15 +104,21 @@ sudo service nginx reload || true ynh_app_setting_set "$app" unprotected_uris "/" sudo yunohost app ssowatconf +# add alias line in hosts file +echo "127.0.0.1 $domain # $app" | sudo tee -a /etc/hosts + # fill the superadmin creation form curl_path=$([ "$path" == "/" ] || echo "$path") -curl https://"$domain""$curl_path"/ > /dev/null 2>&1 -curl -X POST \ +curl -k https://"$domain""$curl_path"/ > /dev/null 2>&1 +sleep 1 && curl -kX POST \ --data-urlencode creation="1" \ --data-urlencode login="$admin" \ --data-urlencode pass="$password" \ --data-urlencode confirm="$password" \ https://"$domain""$curl_path"/index.php?p=login > /dev/null 2>&1 + +# remove alias line from hosts file +sudo sed -i "/# $app/d" /etc/hosts # if app is private, remove url to SSOWat conf from skipped_uris if [ "$is_public" = "No" ]; diff --git a/scripts/restore b/scripts/restore index 82c66eb..385bd23 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,6 +9,7 @@ source /usr/share/yunohost/helpers #retrieve arguments app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get "$app" domain) +path=$(ynh_app_setting_get "$app" path) # definie useful vars parent_path=/var/www