diff --git a/scripts/_common.sh b/scripts/_common.sh index 6662b74..1797990 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -24,7 +24,7 @@ log_file="${log_path}/pyinventory.log" #================================================= # dependencies used by the app -pkg_dependencies="build-essential python3-dev python3-pip python3-virtualenv git \ +pkg_dependencies="build-essential python3-dev python3-pip python3-venv git \ postgresql postgresql-contrib python3-ldap libldap2-dev libsasl2-dev" # PyInventory's version for PIP and settings file @@ -88,4 +88,4 @@ ynh_exec_as() { else sudo -u "$USER" "$@" fi -} \ No newline at end of file +} diff --git a/scripts/backup b/scripts/backup index 91b17e3..6218435 100755 --- a/scripts/backup +++ b/scripts/backup @@ -18,6 +18,7 @@ ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME +public_path=$(ynh_app_setting_get --app="$app" --key=public_path) final_path=$(ynh_app_setting_get --app="$app" --key=final_path) domain=$(ynh_app_setting_get --app="$app" --key=domain) db_name=$(ynh_app_setting_get --app="$app" --key=db_name) @@ -32,6 +33,7 @@ ynh_print_info --message="Declaring files to be backed up..." #================================================= ynh_backup --src_path="$final_path" +ynh_backup --src_path="$public_path" #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 1bbf501..7c91559 100755 --- a/scripts/restore +++ b/scripts/restore @@ -51,6 +51,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_script_progression --message="Restoring the app main directory..." +ynh_restore_file --origin_path="$public_path" ynh_restore_file --origin_path="$final_path" touch "$final_path/local_settings.py"