From 51ebe17d70a7def7076e9765e8837fb2d3dc5464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 18:20:50 +0100 Subject: [PATCH] fix: use standard install directory * Update install * use final_path in systemd config * update package version * Auto-update README --------- Co-authored-by: Emmanuel Averty Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/systemd.service | 2 +- manifest.json | 2 +- scripts/install | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 707df25..81441ea 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Forgejo is a Gitea fork (which is a Gogs fork). A self-hosted Git service writte - Customize HTML templates, static files and many others. -**Shipped version:** 1.18.5-0~ynh2 +**Shipped version:** 1.18.5-0~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index aee0fca..277116b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ Forgejo is a Gitea fork (which is a Gogs fork). A self-hosted Git service writte - Customize HTML templates, static files and many others. -**Version incluse :** 1.18.5-0~ynh2 +**Version incluse :** 1.18.5-0~ynh3 ## Captures d’écran diff --git a/conf/systemd.service b/conf/systemd.service index ac36f2d..eaba8c1 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__DATADIR__/ -ExecStart=/opt/__APP__/forgejo web -p __PORT__ +ExecStart=__FINAL_PATH__/forgejo web -p __PORT__ Restart=always Environment=USER=__APP__ HOME=__DATADIR__/ diff --git a/manifest.json b/manifest.json index 894f8a5..207359d 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ }, "url": "https://forgejo.org", "license": "MIT", - "version": "1.18.5-0~ynh2", + "version": "1.18.5-0~ynh3", "maintainer": { "name": "Emmanuel Averty", "email": "emmanuel.averty@free.fr" diff --git a/scripts/install b/scripts/install index 138acb8..78ce0ca 100644 --- a/scripts/install +++ b/scripts/install @@ -34,7 +34,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path="/opt/$app" +final_path="/var/www/$app" test ! -e "$final_path" || ynh_die --message="This path already contains a folder" ynh_user_exists "$admin" || ynh_die --message "The chosen admin user does not exist."