diff --git a/conf/configuration.ini b/conf/configuration.ini index 648e249..c991389 100644 --- a/conf/configuration.ini +++ b/conf/configuration.ini @@ -10,7 +10,7 @@ UsePathInfo = false ; Vous devez posséder le droit d'écriture sur ce répertoire ; S'il n'existe pas, il sera créé par ChuWiki mais devrez dans ce cas ; avoir les droits d'écriture dans le répertoire -PagePath = __CONTENT_PATH__/pages +PagePath = pages ; Noms des scripts ; Vous devrez peut-être ajouter ".php" si votre serveur ne gère pas MultiViews diff --git a/scripts/backup b/scripts/backup index 1251570..75ce3e0 100755 --- a/scripts/backup +++ b/scripts/backup @@ -39,12 +39,6 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$final_path" -#================================================= -# BACKUP CONTENT DIR -#================================================= - -ynh_backup --src_path="/home/yunohost.app/$app" - #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= diff --git a/scripts/install b/scripts/install index a019eab..6167d38 100755 --- a/scripts/install +++ b/scripts/install @@ -46,8 +46,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -#ynh_app_setting_set --app=$app --key=title --value=$title -#ynh_app_setting_set --app=$app --key=language --value=$language #================================================= # CREATE DEDICATED USER @@ -88,16 +86,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config -#================================================= -# CONTENT PATH CONFIGURATION -#================================================= - -content_path=/home/yunohost.app/$app -mkdir -p $content_path -ynh_app_setting_set --app=$app --key=content_path --value=$content_path -chmod -R 750 $content_path -chown -R $app $content_path - #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/remove b/scripts/remove index 6235979..4a7848b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -27,9 +27,6 @@ ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely ynh_secure_remove --file="$final_path" -# Remove the content directory securely -#ynh_secure_remove --file="/home/yunohost.app/$app" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index fa1263d..005644b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -66,14 +66,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# RESTORE CONTENT DIR -#================================================= - -ynh_restore_file --origin_path="/home/yunohost.app/$app" -chmod -R 750 "/home/yunohost.app/$app" -chown -R $app "/home/yunohost.app/$app" - #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 09355cd..4dc40a3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,13 +71,15 @@ then # Create a temporary directory tmpdir="$(mktemp -d)" cp -a "$final_path/configuration.ini" "$tmpdir/configuration.ini" + cp -a "$final_path/pages" "$tmpdir/pages" ynh_secure_remove --file="$final_path" #Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/configuration.ini" # Copy the admin saved settings from tmp directory to final config path - cp -a "$tmpdir/configuration.ini" "$final_path/configuration.ini" + cp -a "$tmpdir/configuration.ini" "$final_path/configuration.ini" + cp -a "$tmpdir/pages" "$final_path/pages" # Remove the tmp directory securely ynh_secure_remove --file="$tmpdir" fi