From 88e894a01858a723ea62b154103867cafb49dfa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 24 Apr 2022 14:42:25 +0200 Subject: [PATCH] Testing (#22) * upgrade to v.12.1.0 * Update nginx.conf * Upgrade to 12.2.0 (#3) * Upgrade to 12.2.0 * Add maintainer * Fix issue #5 (#6) Explicity set the correct owner and group for the data dir during backup restore Co-authored-by: Rasmus Mattsson Kallio * Version bump * Fix linter warnings * Update manifest.json * Update manifest.json * Set badge in SVG * Finding an available port * Small fixes * Small fix * Cleaning up * Update manifest.json * Update manifest.json * Protect config file * Update manifest.json * [autopatch] Update issue and PR templates (#13) Co-authored-by: Yunohost-Bot <> * Add templates * fix (#16) * Update manifest.json * Auto-update README * Update scripts/install Co-authored-by: tituspijean * Update scripts/upgrade Co-authored-by: tituspijean * Update upgrade * Update check_process * Update check_process * Update manifest.json * Update check_process * Update manifest.json * Auto-update README * Enhance README (#19) * Rename DESCRITION.md to DESCRIPTION.md Co-authored-by: Yunohost-Bot <> * Auto-update README * bump version * Auto-update README * Fix * Update manifest.json * Auto-update README Co-authored-by: Rasmus MK <71251695+rasmus-mk@users.noreply.github.com> Co-authored-by: Rasmus Mattsson Kallio Co-authored-by: Alexandre Aubin Co-authored-by: YunoHost Bot Co-authored-by: Yunohost-Bot <> Co-authored-by: tituspijean Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/nginx.conf | 3 ++- manifest.json | 2 +- scripts/install | 3 +-- scripts/upgrade | 3 +-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0c7e49e..9cdfeac 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Droppy is a self-hosted file storage server with a web interface and capabilities to edit files and view media directly in the browser. -**Shipped version:** 12.2.0~ynh9 +**Shipped version:** 12.2.0~ynh10 diff --git a/README_fr.md b/README_fr.md index 4868bcd..598c79d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Droppy est un serveur de stockage de fichiers auto-hébergé avec une interface Web et des capacités pour éditer des fichiers et afficher des médias directement dans le navigateur. -**Version incluse :** 12.2.0~ynh9 +**Version incluse :** 12.2.0~ynh10 diff --git a/conf/nginx.conf b/conf/nginx.conf index e68d709..d50d905 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,5 @@ -location ^~ __PATH__/ { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { proxy_pass http://127.0.0.1:__PORT__/; proxy_redirect off; diff --git a/manifest.json b/manifest.json index a4b990e..e96fb1f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted file storage server", "fr": "Serveur de stockage de fichiers auto-hébergé" }, - "version": "12.2.0~ynh9", + "version": "12.2.0~ynh10", "url": "https://github.com/silverwind/droppy", "upstream": { "license": "BSD-2-Clause", diff --git a/scripts/install b/scripts/install index 9802cfd..e3eb573 100644 --- a/scripts/install +++ b/scripts/install @@ -126,8 +126,7 @@ chown -R $app:www-data "$data_path" #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" - +env_path="$PATH" ynh_add_systemd_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8d35abc..546d263 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,8 +123,7 @@ chown -R $app: "$final_path" #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=2 -ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" - +env_path="$PATH" # Create a dedicated systemd config ynh_add_systemd_config