Merge pull request #4 from ericgaspar/repackage

Repackage

README.md

@@ -1,7 +1,28 @@
-# 20euros
+# 20euros for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg)  
+[![Install 20euros with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=20euros)
 
-A clone of 2048 game with euro coins and bills
+*[Lire ce readme en français.](./README_fr.md)*
-https://github.com/jatekos101/20euros
 
+> *This package allow you to install 20euros quickly and simply on a YunoHost server.  
+If you don’t have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+
+## Overview
+
+Clone of 2048 game with euro coins and bills.
+
+## Screenshots
+
+![](Screenshot-20euros.jpg)
+
+#### Supported architectures
+
+* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/20euros%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/20euros%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/20euros/)
+
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/20euros_ynh/issues
+ * Upstream app repository: https://github.com/jatekos101/20euros
+ * YunoHost website: https://yunohost.org/

README_fr.md

@@ -0,0 +1,28 @@
+# 20euros pour YunoHost
+
+[![Integration level](https://dash.yunohost.org/integration/20euros.svg)](https://dash.yunohost.org/appci/app/20euros) ![](https://ci-apps.yunohost.org/ci/badges/20euros.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/20euros.maintain.svg)  
+[![Installer 20euros avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=20euros)
+
+*[Read this readme in english.](./README.md)* 
+
+> *Ce package vous permet d’installer 20euros 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
+
+Clone du jeu 2048 avec pièces et billets en euros.
+
+## Captures d’écran
+
+![](Screenshot-20euros.jpg)
+
+#### Architectures supportées
+
+* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/20euros%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/20euros/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/20euros%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/20euros/)
+
+## Liens
+
+ * Signaler un bug : https://github.com/YunoHost-Apps/20euros_ynh/issues
+ * Dépôt de l’application principale : https://github.com/jatekos101/20euros
+ * Site web YunoHost : https://yunohost.org/

check_process

@@ -0,0 +1,30 @@
+;; Test complet
+	auto_remove=1
+	; Manifest
+		domain="domain.tld"	(DOMAIN)
+		path="/path"	(PATH)
+		is_public="Yes"	(PUBLIC|public=Yes|private=No)
+	; Checks
+		pkg_linter=1
+		setup_sub_dir=1
+		setup_root=1
+		setup_nourl=0
+		setup_private=1
+		setup_public=1
+		upgrade=1
+		backup_restore=1
+		multi_instance=1
+		incorrect_path=1
+		port_already_use=0
+		change_url=1
+;;; Levels
+	Level 1=auto
+	Level 2=auto
+	Level 3=auto
+	Level 4=0
+	Level 5=auto
+	Level 6=auto
+	Level 7=auto
+	Level 8=0
+	Level 9=0
+	Level 10=0

conf/nginx.conf

@@ -1,13 +1,14 @@
-location YNH_WWW_PATH {
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
-  alias YNH_WWW_ALIAS ;
+location __PATH__/ {
 
-  # Force https
+	# Path to source
+	alias __FINALPATH__/ ;
+
+	# Force usage of https
 	if ($scheme = http) {
 		rewrite ^ https://$server_name$request_uri? permanent;
 	}
 
-  index index.html;
-
 	# Include SSOWAT user panel.
 	include conf.d/yunohost_panel.conf.inc;
 }

manifest.json

@@ -1,19 +1,30 @@
 {
     "name": "20euros",
     "id": "20euros",
+    "packaging_format": 1,
     "description": {
         "en": "2048 - 20euros",
         "fr": "2048 - 20euros"
     },
-    "developer": {
+    "version": "1.0~ynh1",
-        "name": "Moul",
+    "url": "https://github.com/jatekos101/20euros",
-        "email": "moul@moul.re"
+    "license": "MIT",
+    "maintainer": {
+        "name": "eric_G",
+        "email": "ericgaspar@free.fr"
     },
-    "multi_instance": "false",
+    "requirements": {
+        "yunohost": ">= 3.7.0"
+    },
+    "multi_instance": true,
+    "services": [
+        "nginx"
+    ],
     "arguments": {
         "install" : [
             {
                 "name": "domain",
+                "type": "domain",
                 "ask": {
                     "en": "Choose a domain for 20euros",
                     "fr": "Choisissez un nom de domaine pour 20euros"
@@ -22,6 +33,7 @@
             },
             {
                 "name": "path",
+                "type": "path",
                 "ask": {
                     "en": "Choose a path for 20euros",
                     "fr": "Choisissez un chemin pour 20euros"
@@ -31,12 +43,16 @@
             },
             {
                 "name": "is_public",
+                "type": "boolean",
                 "ask": {
                     "en": "Is it a public game?",
                     "fr": "Est-ce un jeu public ?"
                 },
-                "choices": ["Yes", "No"],
+                 "help": {
-                "default": "Yes"
+                        "en": "If enabled, 20euros will be accessible by people who doesn’t have an account. This can be changed later via the webadmin.",
+                        "fr": "Si cette case est cochée, 20euros sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+                },
+                "default": true
             }
         ]
     }

pull_request_template.md

@@ -0,0 +1,18 @@
+## Problem
+- *Description of why you made this PR*
+
+## Solution
+- *And how do you fix that problem*
+
+## PR Status
+- [ ] Code finished.
+- [ ] Tested with Package_check.
+- [ ] Fix or enhancement tested.
+- [ ] Upgrade from last version tested.
+- [ ] Can be reviewed and tested.
+
+## Package_check results
+---
+*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
+
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/20euros_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/20euros_ynh%20PR-NUM-%20(USERNAME)/)  

scripts/backup

@@ -0,0 +1,47 @@
+#!/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 /usr/share/yunohost/helpers
+
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# LOAD SETTINGS
+#=================================================
+ynh_script_progression --message="Loading installation settings..." --weight=1
+
+app=$YNH_APP_INSTANCE_NAME
+
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+
+#=================================================
+# BACKUP THE APP MAIN DIR
+#=================================================
+ynh_script_progression --message="Backing up the main app directory..." --weight=1
+
+ynh_backup --src_path="$final_path"
+
+#=================================================
+# BACKUP THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Backing up Nginx web server configuration..." --weight=2
+
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last

scripts/change_url

@@ -0,0 +1,107 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source /usr/share/yunohost/helpers
+
+# Stop script if errors
+ynh_abort_if_errors
+
+#=================================================
+# RETRIEVE ARGUMENTS
+#=================================================
+
+old_domain=$YNH_APP_OLD_DOMAIN
+old_path=$YNH_APP_OLD_PATH
+
+new_domain=$YNH_APP_NEW_DOMAIN
+new_path=$YNH_APP_NEW_PATH
+
+app=$YNH_APP_INSTANCE_NAME
+
+#=================================================
+# LOAD SETTINGS
+#=================================================
+ynh_script_progression --message="Loading installation settings..." --weight=1
+
+# Needed for helper "ynh_add_nginx_config"
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." --weight=2
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
+	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
+
+	# restore it if the upgrade fails
+	ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# CHECK WHICH PARTS SHOULD BE CHANGED
+#=================================================
+
+change_domain=0
+if [ "$old_domain" != "$new_domain" ]
+then
+	change_domain=1
+fi
+
+change_path=0
+if [ "$old_path" != "$new_path" ]
+then
+	change_path=1
+fi
+
+#=================================================
+# MODIFY URL IN NGINX CONF
+#=================================================
+ynh_script_progression --message="Updating Nginx web server configuration..." --weight=3
+
+nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
+
+# Change the path in the nginx config file
+if [ $change_path -eq 1 ]
+then
+	# Make a backup of the original nginx config file if modified
+	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
+	# Set global variables for nginx helper
+	domain="$old_domain"
+	path_url="$new_path"
+	# Create a dedicated nginx config
+	ynh_add_nginx_config
+fi
+
+# Change the domain for nginx
+if [ $change_domain -eq 1 ]
+then
+	# Delete file checksum for the old conf file location
+	ynh_delete_file_checksum --file="$nginx_conf_path"
+	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
+	# Store file checksum for the new config file location
+	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
+fi
+
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading Nginx web server..." --weight=2
+
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Change of URL completed for $app" --last

scripts/install

@@ -1,41 +1,98 @@
 #!/bin/bash
 
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source /usr/share/yunohost/helpers
+
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# RETRIEVE ARGUMENTS FROM THE MANIFEST
+#=================================================
 # Retrieve arguments
-domain=$1
-path=$2
-is_public=$3
 
-# Check domain/path availability
+domain=$YNH_APP_ARG_DOMAIN
-sudo yunohost app checkurl $domain$path -a 20euros
+path_url=$YNH_APP_ARG_PATH
-if [[ ! $? -eq 0 ]]; then
+is_public=$YNH_APP_ARG_IS_PUBLIC
-    exit 1
-fi
 
+app=$YNH_APP_INSTANCE_NAME
 
-# Save app settings
+#=================================================
-sudo yunohost app setting 20euros is_public -v "$is_public"
+# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
+#=================================================
+ynh_script_progression --message="Validating installation parameters..." --weight=1
 
 # Copy files to the right place
-final_path=/var/www/20euros
+final_path=/var/www/$app
-sudo mkdir -p $final_path
+test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-sudo cp -a ../sources/* $final_path
 
-# Set permissions
+# Register (book) web path
-sudo chown -R www-data: $final_path
+ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 
-# Modify Nginx configuration file and copy it to Nginx conf directory
+#=================================================
-sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf
+# STORE SETTINGS FROM MANIFEST
-sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf
+#=================================================
-nginxconf=/etc/nginx/conf.d/$domain.d/20euros.conf
+ynh_script_progression --message="Storing installation settings..." --weight=2
-sudo cp ../conf/nginx.conf $nginxconf
-sudo chown root: $nginxconf
-sudo chmod 600 $nginxconf
 
-if [ "$is_public" = "Yes" ];
+ynh_app_setting_set --app=$app --key=domain --value=$domain
-then
+ynh_app_setting_set --app=$app --key=path --value=$path_url
-    sudo yunohost app setting 20euros skipped_uris -v "/"
+ynh_app_setting_set --app=$app --key=is_public --value=$is_public
-fi
 
-# Reload web server & sso
+#=================================================
-sudo service nginx reload
+# STANDARD MODIFICATIONS
-sudo yunohost app ssowatconf
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+ynh_script_progression --message="Setting up source files..." --weight=1
+
+ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+
+mkdir -p $final_path
+cp -a ../sources/* $final_path
+
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring Nginx web server..." --weight=2
+
+# Create a dedicated nginx config
+ynh_add_nginx_config
+
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+
+# Set permissions to app files
+chown -R root: $final_path
+
+#=================================================
+# SETUP SSOWAT
+#=================================================
+ynh_script_progression --message="Configuring SSOwat..." --weight=1
+
+# Make app public if necessary or protect it
+[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors"
+
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading Nginx web server..." --weight=1
+
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Installation of $app completed" --last

scripts/remove

@@ -1,6 +1,43 @@
 #!/bin/bash
 
-domain=$(sudo yunohost app setting 20euros domain)
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
 
-sudo rm -rf /var/www/20euros
+source /usr/share/yunohost/helpers
-sudo rm -f /etc/nginx/conf.d/$domain.d/20euros.conf
+
+#=================================================
+# LOAD SETTINGS
+#=================================================
+ynh_script_progression --message="Loading installation settings..." --weight=1
+
+app=$YNH_APP_INSTANCE_NAME
+
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+
+#=================================================
+# STANDARD REMOVE
+#=================================================
+# REMOVE APP MAIN DIR
+#=================================================
+ynh_script_progression --message="Removing app main directory..." --weight=3
+
+# Remove the app directory securely
+ynh_secure_remove --file="$final_path"
+
+#=================================================
+# REMOVE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Removing Nginx web server configuration..." --weight=1
+
+# Remove the dedicated nginx config
+ynh_remove_nginx_config
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Removal of $app completed" --last

scripts/restore

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source /usr/share/yunohost/helpers
+
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# LOAD SETTINGS
+#=================================================
+ynh_script_progression --message="Loading settings..." --weight=1
+
+app=$YNH_APP_INSTANCE_NAME
+
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+path_url=$(ynh_app_setting_get --app=$app --key=path)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+
+#=================================================
+# CHECK IF THE APP CAN BE RESTORED
+#=================================================
+ynh_script_progression --message="Validating restoration parameters..." --weight=1
+
+ynh_webpath_available --domain=$domain --path_url=$path_url \
+	|| ynh_die --message="Path not available: ${domain}${path_url}"
+test ! -d $final_path \
+	|| ynh_die --message="There is already a directory: $final_path "
+
+#=================================================
+# STANDARD RESTORATION STEPS
+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
+#=================================================
+# RESTORE THE APP MAIN DIR
+#=================================================
+ynh_script_progression --message="Restoring the app main directory..." --weight=2
+
+ynh_restore_file --origin_path="$final_path"
+
+#=================================================
+# RECREATE THE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
+
+# Create the dedicated user (if not existing)
+ynh_system_user_create --username=$app
+
+#=================================================
+# RESTORE USER RIGHTS
+#=================================================
+
+# Restore permissions on app files
+chown -R root: $final_path
+
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading nginx web server..." --weight=3
+
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Restoration completed for $app" --last

scripts/upgrade

@@ -1,34 +1,116 @@
 #!/bin/bash
 
-# Retrieve settings
+#=================================================
-domain=$(sudo yunohost app setting 20euros domain)
+# GENERIC START
-path=$(sudo yunohost app setting 20euros path)
+#=================================================
-is_public=$(sudo yunohost app setting 20euros is_public)
+# IMPORT GENERIC HELPERS
+#=================================================
 
-# Remove trailing "/" for next commands
+source /usr/share/yunohost/helpers
-path=${path%/}
 
-# Copy files to the right place
+#=================================================
-final_path=/var/www/20euros
+# LOAD SETTINGS
-sudo mkdir -p $final_path
+#=================================================
-sudo cp -a ../sources/* $final_path
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
-# Set permissions
+app=$YNH_APP_INSTANCE_NAME
-sudo chown -R www-data: $final_path
 
-# Modify Nginx configuration file and copy it to Nginx conf directory
+domain=$(ynh_app_setting_get --app=$app --key=domain)
-sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf
+path_url=$(ynh_app_setting_get --app=$app --key=path)
-sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf
+is_public=$(ynh_app_setting_get --app=$app --key=is_public)
-nginxconf=/etc/nginx/conf.d/$domain.d/20euros.conf
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-sudo cp ../conf/nginx.conf $nginxconf
-sudo chown root: $nginxconf
-sudo chmod 600 $nginxconf
 
-if [ "$is_public" = "Yes" ];
+#=================================================
-then
+# CHECK VERSION
-    sudo yunohost app setting 20euros skipped_uris -v "/"
+#=================================================
+
+upgrade_type=$(ynh_check_app_version_changed)
+
+#=================================================
+# ENSURE DOWNWARD COMPATIBILITY
+#=================================================
+ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
+
+# Fix is_public as a boolean value
+if [ "$is_public" = "Yes" ]; then
+	ynh_app_setting_set --app=$app --key=is_public --value=1
+	is_public=1
+elif [ "$is_public" = "No" ]; then
+	ynh_app_setting_set --app=$app --key=is_public --value=0
+	is_public=0
 fi
 
-# Reload web server & sso
+# If final_path doesn't exist, create it
-sudo service nginx reload
+if [ -z "$final_path" ]; then
-sudo yunohost app ssowatconf
+	final_path=/var/www/$app
+	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+fi
+
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=3
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+	# restore it if the upgrade fails
+	ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# CHECK THE PATH
+#=================================================
+
+path_url=$(ynh_normalize_url_path --path_url=$path_url)
+
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_script_progression --message="Upgrading source files..." --weight=4
+
+	# Download the source from ../sources	
+	mkdir -p $final_path
+	cp -a ../sources/* $final_path
+fi
+
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=2
+
+# Create a dedicated nginx config
+ynh_add_nginx_config
+
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+
+# Set permissions on app files
+chown -R root: $final_path
+
+#=================================================
+# SETUP SSOWAT
+#=================================================
+ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=1
+
+# Make app public if necessary or protect it
+[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors"
+
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading nginx web server..." --weight=1
+
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Upgrade of $app completed" --last

sources/comment.html

@@ -30,4 +30,3 @@ alt="ingyenes webstatisztika"></a></div></noscript>
 
 </body>
 </html>
-

sources/index.html

@@ -31,7 +31,7 @@
       </div>
 </div>
     
- <p class="game-intro">Join the coins until you reach <strong>20 Euro</strong>! 
+ <p class="game-intro">Join the coins until you reach <strong>20 Euros</strong>! 
 
 
 </p>
@@ -40,7 +40,7 @@
       <div class="game-message">
         <p></p>
         <div class="lower">
-	        <a class="keep-playing-button">Continue (maybe 50 Euro?)</a>
+	        <a class="keep-playing-button">Continue (maybe 50 Euros?)</a>
           <a class="retry-button">Retry</a>
           <div class="score-sharing"></div>
         </div>
@@ -91,7 +91,7 @@
 
 
     <p class="game-explanation">
-      <strong class="important">HOW TO PLAY: </strong> Use your <strong>arrow keys</strong> to move the coins. If two or three mergeable coins touch, they <strong>merge into one!</strong> Your goal is to reach the <strong>20 Euro</strong> note! Restart with <strong>Space</strong>.
+      <strong class="important">HOW TO PLAY: </strong> Use your <strong>arrow keys</strong> to move the coins. If two or three mergeable coins touch, they <strong>merge into one!</strong> Your goal is to reach the <strong>20 Euros</strong> note! Restart with <strong>Space</strong>.
     </p>
     <hr>
 <p class="game-explanation">

sources/statistics.html

@@ -74,8 +74,6 @@ Ref50000.on('value', function(newPlays) {
  </script>
 
 
-
-
   <div class="container">
     <div class="heading">
       <h1 class="title">Statistics</h1>
@@ -100,23 +98,6 @@ Statistics since 2014-04-06.
  </p> 
 </div>
 
-<script type="text/javascript">
-var sc_project=9719822; 
-var sc_invisible=1; 
-var sc_security="bccc6417"; 
-var scJsHost = (("https:" == document.location.protocol) ?
-"https://secure." : "http://www.");
-document.write("<sc"+"ript type='text/javascript' src='" +
-scJsHost+
-"statcounter.com/counter/counter.js'></"+"script>");
-</script>
-<noscript><div class="statcounter"><a title="web analytics"
-href="http://statcounter.com/" target="_blank"><img
-class="statcounter"
-src="http://c.statcounter.com/9719822/0/bccc6417/1/"
-alt="web analytics"></a></div></noscript>
-
-
 </body>
 </html>