Merge pull request #21 from YunoHost-Apps/testing

Testing

.github/workflows/updater.sh

@@ -119,9 +119,6 @@ done
 # GENERIC FINALIZATION
 #=================================================
 
-# Install moreutils, needed for sponge
-sudo apt-get install moreutils
-
 # Replace new version in manifest
 jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json | sponge manifest.json
 

.github/workflows/updater.yml

@@ -41,6 +41,7 @@ jobs:
           author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
           signoff: false
           branch: ci-auto-update-v${{ env.VERSION }}
+          base: testing
           delete-branch: true
           title: 'Upgrade to version ${{ env.VERSION }}'
           body: |

README.md

@@ -26,6 +26,17 @@ TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a sin
 ![](./doc/screenshots/.DS_Store)
 ![](./doc/screenshots/screenshot.png)
 
+## Disclaimers / important information
+
+## Save your Tiddlers!
+
+It is very important that you regularly backup your notes (tiddlers) locally.
+
+- Click on the cloud icon -> `Save snapshot for offline use`
+
+To restore a local backup to the server, drag and drop your tiddlers backup file into your TiddlyWiki page.
+
+
 ## Documentation and resources
 
 * Official app website: https://tiddlywiki.com/

README_fr.md

@@ -22,6 +22,17 @@ TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a sin
 ![](./doc/screenshots/.DS_Store)
 ![](./doc/screenshots/screenshot.png)
 
+## Avertissements / informations importantes
+
+## Save your Tiddlers!
+
+It is very important that you regularly backup your notes (tiddlers) locally.
+
+- Click on the cloud icon -> `Save snapshot for offline use`
+
+To restore a local backup to the server, drag and drop your tiddlers backup file into your TiddlyWiki page.
+
+
 ## Documentations et ressources
 
 * Site officiel de l'app : https://tiddlywiki.com/

conf/app.src

@@ -3,4 +3,3 @@ SOURCE_SUM=a35f8a4cb25f1f75e49ec40dcc9b1cd7ef4fb099322507464272be720fdc28d3
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=

conf/nginx.conf

@@ -1,10 +1,5 @@
 location / {
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   proxy_pass        http://127.0.0.1:__PORT__/;
   proxy_redirect    off;
   proxy_set_header  Host $host;

doc/DISCLAIMER.md

@@ -0,0 +1,8 @@
+## Save your Tiddlers!
+
+It is very important that you regularly backup your notes (tiddlers) locally.
+
+- Click on the cloud icon -> `Save snapshot for offline use`
+
+To restore a local backup to the server, drag and drop your tiddlers backup file into your TiddlyWiki page.
+

manifest.json

@@ -21,7 +21,7 @@
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": false,
     "services": [
@@ -31,8 +31,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "domain.org"
+                "type": "domain"
             },
             {
                 "name": "is_public",

scripts/backup

@@ -47,7 +47,11 @@ ynh_backup --src_path="$final_path"
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
-# SPECIFIC BACKUP
+# BACKUP LOGROTATE
+#=================================================
+
+ynh_backup --src_path="/etc/logrotate.d/$app"
+
 #=================================================
 # BACKUP SYSTEMD
 #=================================================

scripts/install

@@ -112,6 +112,14 @@ ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --targ
 
 ynh_add_systemd_config
 
+#=================================================
+# SETUP LOGROTATE
+#=================================================
+ynh_script_progression --message="Configuring log rotation..." --weight=1
+
+# Use logrotate to manage application logfile(s)
+ynh_use_logrotate
+
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================

scripts/remove

@@ -41,6 +41,14 @@ ynh_script_progression --message="Stopping and removing the systemd service..."
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
+#=================================================
+# REMOVE LOGROTATE CONFIGURATION
+#=================================================
+ynh_script_progression --message="Removing logrotate configuration..."
+
+# Remove the app-specific logrotate config
+ynh_remove_logrotate
+
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================

scripts/restore

@@ -84,6 +84,13 @@ ynh_script_progression --message="Restoring the systemd configuration..." --weig
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
 
+#=================================================
+# RESTORE THE LOGROTATE CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/logrotate.d/$app"
+
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================

scripts/upgrade

@@ -119,6 +119,14 @@ ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --targ
 
 ynh_add_systemd_config
 
+#=================================================
+# SETUP LOGROTATE
+#=================================================
+ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1
+
+# Use logrotate to manage app-specific logfile(s)
+ynh_use_logrotate --non-append
+
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================