diff --git a/TODO.org b/TODO.org index a26ff41..39805fb 100644 --- a/TODO.org +++ b/TODO.org @@ -44,7 +44,7 @@ admin@yunohost:/home/yunohost.app/ghostblog$ du -sh ghost/* * TODO use shrink to fix dependencies version. cf. https://www.npmjs.org/doc/shrinkwrap.html * TODO implement upgrade * TODO if public, block access to admin section via sso -* TODO support installation on root of subdomain +* DONE support installation on root of subdomain * TODO test non-public install * TODO translate manifest * DONE aptitude update diff --git a/scripts/install b/scripts/install index 5649bd9..a6ed9ee 100644 --- a/scripts/install +++ b/scripts/install @@ -68,7 +68,7 @@ sudo yunohost app setting ghostblog mysqlpwd -v $db_pwd echo "Deploying configuration..." sed -i "s@YNH_DOMAIN@$domain@g" ../conf/config.js -sed -i "s@YNH_LOCATION@$path@g" ../conf/config.js +sed -i "s@YNH_LOCATION@${path%/}@g" ../conf/config.js sed -i "s@YNH_DBNAME@$db_name@g" ../conf/config.js sed -i "s@YNH_DBUSER@$db_user@g" ../conf/config.js sed -i "s@YNH_DBPWD@$db_pwd@g" ../conf/config.js @@ -106,10 +106,10 @@ echo "Registering admin..." sleep 5 admin_name=$(sudo yunohost user list | python ../conf/user_getname.py $admin) admin_mail=$(sudo yunohost user list | python ../conf/user_getmail.py $admin) -curl -kL -X GET https://$domain$path/ghost/signup --cookie-jar cookie.txt > signup_get +curl -kL -X GET https://$domain${path%/}/ghost/signup --cookie-jar cookie.txt > signup_get sleep 5 csrf_token=$(cat signup_get | egrep csrf-param | egrep "content=\".+\"" -o | egrep "\".+\"" -o | cut -d '"' -f 2) -curl -kL -X POST https://$domain$path/ghost/signup/ \ +curl -kL -X POST https://$domain${path%/}/ghost/signup/ \ --cookie cookie.txt --header "X-CSRF-Token: $csrf_token" \ --data-urlencode "name=$admin_name" \ --data-urlencode "email=$admin_mail" \