diff --git a/manifest.json b/manifest.json index 4da5415..e729580 100644 --- a/manifest.json +++ b/manifest.json @@ -28,21 +28,11 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain for Friendica", - "fr": "Choisissez un domaine pour Friendica" + "en": "Choose a domain for Friendica.Friendica must be installed on the ROOT domain, so be careful", + "fr": "Choisissez un domaine pour Friendica.Friendica doit etre installe a la racine, soyez prudent" }, "example": "domain.org" }, - { - "name": "path", - "type": "path", - "ask": { - "en": "No choice, Friendica must be installed on the ROOT domain, so be careful", - "fr": "Pas de choix, Friendica doit etre installe a la racine, soyez prudent" - }, - "example": "/", - "default": "/" - }, { "name": "admin", "type": "user", @@ -52,15 +42,7 @@ }, "example": "homer" }, - { - "name": "is_public", - "type": "boolean", - "ask": { - "en": "Is it a public Friendica site ?", - "fr": "Est-ce un site public ?" - }, - "default": "true" - } + ] } } diff --git a/scripts/install b/scripts/install index 61a73b3..a19dda8 100644 --- a/scripts/install +++ b/scripts/install @@ -22,9 +22,9 @@ ynh_abort_if_errors # Retrieve arguments domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH +path_url='/' admin=$YNH_APP_ARG_ADMIN -is_public=$YNH_APP_ARG_IS_PUBLIC +is_public='true' # This is a multi-instance app, meaning it can be installed several times independently # The id of the app as stated in the manifest is available as $YNH_APP_ID @@ -130,16 +130,10 @@ sudo cp ../conf/poller-cron /etc/cron.d/$app # SETUP SSOWAT #================================================= -if [ $is_public -eq 0 ] -then # Remove the public ac https://yourhostname.tld/install/testrewrite acess - ynh_app_setting_delete $app skipped_uris -fi -# Make app public if necessary -if [ $is_public -eq 1 ] -then + # unprotected_uris allows SSO credentials to be passed anyway. ynh_app_setting_set $app unprotected_uris "/" -fi + #================================================= # RELOAD NGINX diff --git a/scripts/restore b/scripts/restore index 307258b..bc0b53a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -28,7 +28,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) path_url=$(ynh_app_setting_get $app path) -is_public=$(ynh_app_setting_get $app is_public) final_path=$(ynh_app_setting_get $app final_path) db_name=$(ynh_app_setting_get $app db_name) @@ -68,14 +67,8 @@ sudo chmod -R 777 $final_path/view/smarty3 #================================================= ynh_restore_file "/etc/cron.d/$app" - -# Make app public if necessary -if [ "$is_public" = "Yes" ]; -then - ynh_app_setting_set $app skipped_uris "/" -else - ynh_app_setting_set $app protected_uris "/" -fi +# unprotected_uris allows SSO credentials to be passed anyway. +ynh_app_setting_set $app unprotected_uris "/" # And Reload services sudo service php5-fpm reload