From b16ce1d17a13dafb1f0e74c972a1849b4b10cb91 Mon Sep 17 00:00:00 2001 From: Navan Chauhan Date: Wed, 15 Jun 2022 21:23:34 +0530 Subject: [PATCH] install on subpath --- check_process | 4 ++-- conf/nginx.conf | 2 +- conf/systemd.service | 2 +- manifest.json | 8 +++++++- scripts/change_url | 6 ++++++ scripts/install | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/check_process b/check_process index 2617b17..b547924 100644 --- a/check_process +++ b/check_process @@ -1,11 +1,11 @@ ;; Test complet ; Manifest domain="domain.tld" - path="/" + path="/path" is_public=1 ; Checks pkg_linter=1 - setup_sub_dir=0 + setup_sub_dir=1 setup_root=1 setup_nourl=0 setup_private=1 diff --git a/conf/nginx.conf b/conf/nginx.conf index d601a3a..03d067a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location / { +location __PATH__/ { proxy_pass http://127.0.0.1:__PORT__; proxy_redirect off; diff --git a/conf/systemd.service b/conf/systemd.service index eeb2d71..ae18c37 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/shiori serve --port __PORT__ +ExecStart=__FINALPATH__/shiori serve --port __PORT__ --webroot __PATH__ Restart=always Environment="SHIORI_DIR=__DATADIR__" diff --git a/manifest.json b/manifest.json index b3ca4c2..67c9117 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Simple bookmark manager", "fr": "Gestionnaire de liens simple" }, - "version": "1.5.2~ynh1", + "version": "1.5.2~ynh2", "url": "https://github.com/go-shiori/shiori", "upstream": { "license": "MIT", @@ -34,6 +34,12 @@ "name": "domain", "type": "domain" }, + { + "name": "path", + "type": "path", + "example": "/example", + "default": "/example" + }, { "name": "is_public", "type": "boolean", diff --git a/scripts/change_url b/scripts/change_url index 76b4138..5fc3559 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -78,6 +78,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf +systemd_conf_path=/etc/systemd/system/$app.service # Change the path in the NGINX config file if [ $change_path -eq 1 ] @@ -89,6 +90,11 @@ then path_url="$new_path" # Create a dedicated NGINX config ynh_add_nginx_config + + # Make a backup of the original Systemd file if modified + ynh_backup_if_checksum_is_different --file="$systemd_conf_path" + + datadir=$(ynh_app_setting_get --app=$app --key=datadir) fi # Change the domain for NGINX diff --git a/scripts/install b/scripts/install index b2e8e1e..4400750 100755 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url="/" +path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC architecture=$YNH_ARCH