Update manifestv2 app

manifestv2_app_ynh/README.md

@@ -1,48 +0,0 @@
-<!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
-It shall NOT be edited by hand.
--->
-
-# Hextris for YunoHost
-
-[![Integration level](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg)  
-[![Install Hextris with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris)
-
-*[Lire ce readme en français.](./README_fr.md)*
-
-> *This package allows you to install Hextris quickly and simply on a YunoHost server.
-If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
-
-## Overview
-
-Rotate the Hexagon to prevent the blocks from stacking outside the outer grey hexagon!
-
-HEXTRIS is a fast paced puzzle game inspired by Tetris. Blocks start on the edges of the screen, and fall towards the inner blue hexagon. The objective of the game is to prevent the blocks from stacking outside the area of the grey hexagon. To do this, you must rotate the hexagon to manage different stacks of blocks on each face. Aim to connect 3 or more blocks of the same color: when 3 or more blocks of the same color touch each other, they are destroyed, and the blocks above them slide down! Destroying multiple series of blocks grants combos, whose durations are indicated by a quickly receding outline around the outer, grey hexagon. You lose once blocks on a face of the hexagon stack outside of the outer hexagon!
-
-**Shipped version:** 2020-05-05~ynh4
-
-**Demo:** https://hextris.io/
-
-## Screenshots
-
-![](./doc/screenshots/screenshot.jpg)
-
-## Documentation and resources
-
-* Official app website: http://hextris.github.io/
-* Upstream app code repository: https://github.com/Hextris/Hextris
-* YunoHost documentation for this app: https://yunohost.org/app_hextris
-* Report a bug: https://github.com/YunoHost-Apps/hextris_ynh/issues
-
-## Developer info
-
-Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/hextris_ynh/tree/testing).
-
-To try the testing branch, please proceed like that.
-```
-sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug
-or
-sudo yunohost app upgrade hextris -u https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug
-```
-
-**More info regarding app packaging:** https://yunohost.org/packaging_apps

manifestv2_app_ynh/README_fr.md

@@ -1,44 +0,0 @@
-# Hextris pour YunoHost
-
-[![Niveau d'intégration](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg)  
-[![Installer Hextris avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris)
-
-*[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
-
-> *Ce package vous permet d'installer Hextris rapidement et simplement sur un serveur YunoHost.
-Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
-
-## Vue d'ensemble
-
-Rotate the Hexagon to prevent the blocks from stacking outside the outer grey hexagon!
-
-HEXTRIS is a fast paced puzzle game inspired by Tetris. Blocks start on the edges of the screen, and fall towards the inner blue hexagon. The objective of the game is to prevent the blocks from stacking outside the area of the grey hexagon. To do this, you must rotate the hexagon to manage different stacks of blocks on each face. Aim to connect 3 or more blocks of the same color: when 3 or more blocks of the same color touch each other, they are destroyed, and the blocks above them slide down! Destroying multiple series of blocks grants combos, whose durations are indicated by a quickly receding outline around the outer, grey hexagon. You lose once blocks on a face of the hexagon stack outside of the outer hexagon!
-
-**Version incluse :** 2020-05-05~ynh4
-
-**Démo :** https://hextris.io/
-
-## Captures d'écran
-
-![](./doc/screenshots/screenshot.jpg)
-
-## Documentations et ressources
-
-* Site officiel de l'app : http://hextris.github.io/
-* Dépôt de code officiel de l'app : https://github.com/Hextris/Hextris
-* Documentation YunoHost pour cette app : https://yunohost.org/app_hextris
-* Signaler un bug : https://github.com/YunoHost-Apps/hextris_ynh/issues
-
-## Informations pour les développeurs
-
-Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/hextris_ynh/tree/testing).
-
-Pour essayer la branche testing, procédez comme suit.
-```
-sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug
-ou
-sudo yunohost app upgrade hextris -u https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug
-```
-
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps

manifestv2_app_ynh/conf/nginx.conf

@@ -2,7 +2,7 @@
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/ ;
+  alias __INSTALL_DIR__/ ;
 
   # Force usage of https
   if ($scheme = http) {

manifestv2_app_ynh/manifest.toml

@@ -1,11 +1,10 @@
 packaging_format = 2
 
-id = "hextris"
+id = "manifestv2app"
-name = "Hextris"
+name = "Manifest v2 app"
-description.en = "A fast paced puzzle game"
+description.en = "Demonstrate the manifest/packaging v2 format (adapted from Hextris)"
-description.fr = "Un jeu de puzzle très rapide"
 
-version = "2020-05-05~ynh4"
+version = "2020.05.05~ynh4"
 
 maintainers = ["foobar"]
 
@@ -17,23 +16,18 @@ code = "https://github.com/Hextris/Hextris"
 
 [integration]
 yunohost = ">= 4.2.4"
-architectures = "all" # Can be replaced by a list of supported archs 
+architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64/armel), for example: ["amd64", "i386"]
-                      # using the dpkg --print-architecture nomenclature, for example: ["amd64", "i386"]
 multi_instance = true
-ldap = "?"
+ldap = "?" # FIXME: replace with true, false, or "not_relevant"
-sso = "?"
+sso = "?" # FIXME: replace with true, false, or "not_relevant"
-
+disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ...
-disk = "50M"
+ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
-ram.build = "1G"      # This is an *estimate* minimum value for the disk/ram needed at build time (e.g. during install/upgrade) and during regular usage
+ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
-ram.runtime = "10M"   # Please only use round values such as: 10M, 100M, 200M, 400M, 800M, 1G, 2G, 4G, 8G
-ram.include_swap = false
 
 [install]
-
     [install.domain]
     # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
-    full_domain = false
 
     [install.path]
     # this is a generic question - ask strings are automatically handled by Yunohost's core
@@ -41,55 +35,18 @@ ram.include_swap = false
     default = "/hextris"
 
     [install.init_main_permission]
-    # this is (to become) a generic question - ask strings are automatically handled by Yunohost's core
+    help.en = "If enabled, Hextris will be accessible by people who doesn't have an account. This can be changed later via the webadmin."
-    ask.en = "Who should have access to this application ? (This can later be changed in the webadmin)"
+    help.fr = "Si cette case est cochée, Hextris sera accessible aux personnes n'ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
     type = "group"
     default = "visitors"
 
 [resources]
-
     [resources.system_user]
 
     [resources.install_dir]
-    alias = "final_path"
- 
-    [resources.data_dir]
-    alias = "datadir"
 
     [resources.permissions]
     main.url = "/"
     
-    admin.url = "/admin"
-    admin.show_tile = false
-    
-    api.url = "/api"
-    api.allowed = "visitors"
-    api.protected = true
-
     [resources.apt]
-    packages = "nyancat, sl"
+    packages = "nyancat, lolcat, sl"
-
-    #    [[resources.apt.extra]]
-    #    repo = "deb https://dl.yarnpkg.com/debian/ stable main"
-    #    key = "https://dl.yarnpkg.com/debian/pubkey.gpg"
-    #    packages = "yarn"
-
-
-    # (Below, to be handled in packaging v3...)
-
-    #[resources.sources]
-    #main.url = "https://github.com/Hextris/hextris/archive/8872ec47d694628e2fe668ebaa90b13d5626d95f.tar.gz"
-    #main.sha256sum = "67f3fbd54c405717a25fb1e6f71d2b46e94c7ac6971861dd99ae5e58f6609892"
-    #main.predownload = true
-    
-    #[resources.conf_nginx]
-
-    #[resources.conf_logrotate]
-
-    #[resources.conf_fail2ban]
-
-    #[resources.conf_phpfpm]
-
-    #[resources.conf_systemd]
-    #integrate_in_yunohost = true
-    # FIXME : watdo if many services

manifestv2_app_ynh/scripts/backup

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
@@ -8,7 +15,8 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_print_info --message="Declaring files to be backed up..."
 
-ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$install_dir"
+
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================

manifestv2_app_ynh/scripts/install

@@ -1,13 +1,22 @@
 #!/bin/bash
 
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
 source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# STANDARD MODIFICATIONS
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1
 
+# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
 chmod 750 "$install_dir"
@@ -19,7 +28,5 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..." --weight=2
 
-#oekdowkodewodk
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config

manifestv2_app_ynh/scripts/remove

@@ -9,8 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD REMOVE
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================

manifestv2_app_ynh/scripts/restore

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
@@ -17,11 +24,20 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R $app:www-data "$install_dir"
+
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
+
+ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT

manifestv2_app_ynh/scripts/upgrade

@@ -1,8 +1,20 @@
 #!/bin/bash
 
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
 source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# CHECK VERSION
+#=================================================
+
+upgrade_type=$(ynh_check_app_version_changed)
+
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -14,12 +26,12 @@ 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"
+	ynh_setup_source --dest_dir="$install_dir"
 fi
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -29,6 +41,13 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
+
+ynh_systemd_action --service_name=nginx --action=reload
+
 #=================================================
 # END OF SCRIPT
 #=================================================