Merge pull request #9 from YunoHost-Apps/testing

Testing

README.md

@@ -30,7 +30,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl
 
 [Shiori Web Extension](https://github.com/go-shiori/shiori-web-ext) is a simple extension for managing bookmarks using Shiori. This extension is intended to integrate Shiori with your favorite web browser. This way, you can save and remove bookmarks in Shiori without switching from your current page.
 
-**Shipped version:** 1.5.2~ynh1
+**Shipped version:** 1.5.2~ynh2
 
 **Demo:** https://demo.example.com
 
@@ -40,6 +40,8 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl
 
 ## Disclaimers / important information
 
+### First log in
+
 The default account is `shiori` with password `gopher`. It is removed once another 'owner' account is created.
 
 - username: `shiori`

README_fr.md

@@ -30,7 +30,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl
 
 [Shiori Web Extension](https://github.com/go-shiori/shiori-web-ext) is a simple extension for managing bookmarks using Shiori. This extension is intended to integrate Shiori with your favorite web browser. This way, you can save and remove bookmarks in Shiori without switching from your current page.
 
-**Version incluse :** 1.5.2~ynh1
+**Version incluse :** 1.5.2~ynh2
 
 **Démo :** https://demo.example.com
 
@@ -40,6 +40,8 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl
 
 ## Avertissements / informations importantes
 
+### First log in
+
 The default account is `shiori` with password `gopher`. It is removed once another 'owner' account is created.
 
 - username: `shiori`

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

conf/nginx.conf

@@ -1,4 +1,5 @@
-location / {
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location __PATH__/ {
 
   proxy_pass        http://127.0.0.1:__PORT__;
   proxy_redirect    off;

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__"
 

doc/DISCLAIMER.md

@@ -1,3 +1,5 @@
+### First log in
+
 The default account is `shiori` with password `gopher`. It is removed once another 'owner' account is created.
 
 - username: `shiori`

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": "/shiori",
+                "default": "/shiori"
+            },
             {
                 "name": "is_public",
                 "type": "boolean",

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,13 @@ 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"
+	# Get value for systemd helper
+	datadir=$(ynh_app_setting_get --app=$app --key=datadir)
+	# Create systemd service
+	ynh_add_systemd_config
 fi
 
 # Change the domain for NGINX

scripts/install

@@ -21,9 +21,8 @@ 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
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -72,7 +71,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
+ynh_setup_source --dest_dir="$final_path" --source_id=$YNH_ARCH
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"

scripts/upgrade

@@ -69,7 +69,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
+	ynh_setup_source --dest_dir="$final_path" --source_id=$YNH_ARCH
 fi
 
 chmod 750 "$final_path"