diff --git a/manifest.toml b/manifest.toml index d090fda..a21d408 100644 --- a/manifest.toml +++ b/manifest.toml @@ -83,9 +83,6 @@ ram.runtime = "50M" [resources.install_dir] - [resources.data_dir] - subdirs =["_data", "galleries", "upload"] - [resources.permissions] main.url = "/" diff --git a/scripts/_common.sh b/scripts/_common.sh index 0e701fc..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,16 +8,6 @@ # PERSONAL HELPERS #================================================= -_create_data_dirs_if_required() { - dirs=(_data galleries upload) - for dir in "${dirs[@]}"; do - if [ ! -d "$data_dir/$dir" ]; then - rsync -a "$install_dir/$dir/" "$data_dir/$dir/" - fi - ynh_secure_remove "$install_dir/$dir" - done -} - #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 82ac839..773fbb3 100644 --- a/scripts/backup +++ b/scripts/backup @@ -19,12 +19,6 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" -#================================================= -# BACKUP THE DATA DIR -#================================================= - -ynh_backup --src_path="$data_dir" --is_big - #================================================= # BACKUP THE SYSTEM CONFIGURATION #================================================= diff --git a/scripts/install b/scripts/install index 9453cf1..f50651a 100644 --- a/scripts/install +++ b/scripts/install @@ -26,19 +26,6 @@ ynh_setup_source --dest_dir="$install_dir/plugins" --source_id=log_failed_logins chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" -#================================================= -# CREATE LINK TO DATA DIRECTORY -#================================================= -ynh_script_progression --message="Creating a data directory..." - -ln -sd $data_dir/_data $install_dir/_data -ln -sd $data_dir/upload $install_dir/upload -ln -sd $data_dir/galleries $install_dir/galleries - -chmod 750 "$data_dir" -chmod -R o-rwx "$data_dir" -chown -R $app:www-data "$data_dir" - #================================================= # SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/restore b/scripts/restore index f492243..e814040 100644 --- a/scripts/restore +++ b/scripts/restore @@ -18,15 +18,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" -#================================================= -# RESTORE THE DATA DIRECTORY -#================================================= -ynh_script_progression --message="Restoring the data directory..." --weight=2 - -ynh_restore_file --origin_path="$data_dir" --not_mandatory - -chown -R "$app:www-data" "$data_dir" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6227e48..42bdf7f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,7 +25,7 @@ fi #================================================= ynh_script_progression --message="Upgrading source files..." --weight=3 -ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="local/config/config.inc.php local/config/database.inc.php" +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="local/config/config.inc.php local/config/database.inc.php _data galleries upload" ynh_setup_source --dest_dir="$install_dir/plugins/Ldap_Login" --source_id=ldap_plugin --full_replace=1 ynh_setup_source --dest_dir="$install_dir/plugins" --source_id=log_failed_logins_plugin --full_replace=1