Merge pull request #27 from YunoHost-Apps/testing

Testing
2024-09-03 18:06:25 +02:00 · 2021-04-17 19:56:23 +02:00 · 2021-04-17 19:56:23 +02:00 · ad1abc5af9
commit ad1abc5af9
parent 60f6632928 a9249a14df
9 changed files with 30 additions and 68 deletions
--- a/README.md
+++ b/README.md
@ -1,17 +1,16 @@
 # Cesium package for YunoHost

 [![Integration level](https://dash.yunohost.org/integration/cesium.svg)](https://dash.yunohost.org/appci/app/cesium) ![](https://ci-apps.yunohost.org/ci/badges/cesium.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cesium.maintain.svg)  
-[![Install Cesium with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=cesium)
-
+[![Install Cesium with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cesium)

 > *This package allows you to install Cesium 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
 [Cesium](https://cesium.app) is an [Unhosted webapp](https://unhosted.org) client for any [Duniter](https://duniter.org) crypto-currency.
-It allows you to manage your wallet, certify your friends, and more !
+It allows you to manage your wallet, certify your friends, and more!

-**Shipped version:** v1.6.7
+**Shipped version:** 1.6.7

 ## YunoHost specific features

@ -29,8 +28,7 @@ It allows you to manage your wallet, certify your friends, and more !

 ---

-Developer info
----------------
+## Developer info

 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/cesium_ynh/tree/testing).

--- a/3
+++ b/3
@ -17,9 +17,6 @@
 		multi_instance=0
 		port_already_use=0
 		change_url=1
-;;; Levels
-	# If the level 5 (Package linter) is forced to 1. Please add justifications here.
-	Level 5=auto
 ;;; Options
 Email=
 Notification=none
--- a/manifest.json
+++ b/manifest.json
@ -6,7 +6,7 @@
        "en": "Duniter client to manage wallets, certifications in a libre money.",
        "fr": "Client Duniter pour gérer ses portes-monnaie, les certifications au sein d’une monnaie libre."
    },
-    "version": "v1.6.7~ynh1",
+    "version": "1.6.7~ynh2",
    "url": "https://github.com/duniter/cesium",
    "license": "AGPL-3.0-or-later",
    "maintainer": {
@ -15,7 +15,7 @@
        "url": "https://moul.re"
    },
    "requirements": {
-        "yunohost": ">> 3.7.0"
+        "yunohost": ">> 4.1.7"
    },
    "multi_instance": false,
    "services": [
@ -25,30 +25,18 @@
        "install" : [
            {
                "name": "domain",
-		"type": "domain",
-                "ask": {
-                    "en": "Choose a domain name for Cesium",
-                    "fr": "Choisissez un nom de domaine pour Césium"
-                },
+                "type": "domain",
                "example": "example.com"
            },
            {
                "name": "path",
 		        "type": "path",
-                "ask": {
-                    "en": "Choose a path for Cesium",
-                    "fr": "Choisissez un chemin pour Césium"
-                },
                "example": "/cesium",
                "default": "/cesium"
            },
            {
                "name": "is_public",
                "type": "boolean",
-                "ask": {
-                    "en": "Is it a public application?",
-                    "fr": "Est-ce une application publique ?"
-                },
                "help": {
                    "en": "If it is a public application, there will not have authentification",
                    "fr": "Si l'application est publique, il n'y aura pas d'authentification"
--- a/pull_request_template.md
+++ b/pull_request_template.md
@ -13,6 +13,4 @@

 ## 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/cesium_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/cesium_ynh%20PR-NUM-%20(USERNAME)/)  
+* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
--- a/scripts/change_url
+++ b/scripts/change_url
@ -50,7 +50,7 @@ fi
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating nginx web server configuration..."
+ynh_script_progression --message="Updating NGINX web server configuration..."

 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf

@ -79,7 +79,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."

 ynh_systemd_action --service_name=nginx --action=reload

--- a/scripts/install
+++ b/scripts/install
@ -61,13 +61,11 @@ ynh_setup_source --dest_dir="$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring nginx web server..."
+ynh_script_progression --message="Configuring NGINX web server..."

-### `ynh_add_nginx_config` will use the file conf/nginx.conf
 # Create a dedicated nginx config
 ynh_add_nginx_config

-
 if [ "$path_url" != "/" ]
 then
  ynh_replace_string "^#sub_path_only" "" "/etc/nginx/conf.d/$domain.d/$app.conf"
@ -86,16 +84,13 @@ chown -R www-data: $final_path
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..."
-
-# Remove the public access
-ynh_app_setting_delete --app=$app --key=skipped_uris
+ynh_script_progression --message="Configuring permissions..."

 # If app is public, add url to SSOWat conf as skipped_uris and read-only mode
 if [ $is_public -eq 1 ]
 then
  # unprotected_uris allows SSO credentials to be passed anyway.
-  ynh_permission_update --permission "main" --add "visitors"
+  ynh_permission_update --permission="main" --add="visitors"
  # activate read-only
  ynh_replace_string --match_string='"readonly": false,' --replace_string='"readonly": true,' --target_file="$final_path/config.js"
 fi
@ -103,7 +98,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."

 ynh_systemd_action --service_name=nginx --action=reload

--- a/scripts/remove
+++ b/scripts/remove
@ -31,9 +31,9 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing nginx web server configuration..."
+ynh_script_progression --message="Removing NGINX web server configuration..."

-# Remove the dedicated nginx config
+# Remove the dedicated NGINX config
 ynh_remove_nginx_config

 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -46,7 +46,7 @@ test ! -d $final_path \
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the nginx configuration..."
+ynh_script_progression --message="Restoring the NGINX configuration..."

 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"

@ -70,7 +70,7 @@ chown -R www-data: $final_path
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."

 ynh_systemd_action --service_name=nginx --action=reload

--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -19,8 +19,8 @@ app=$YNH_APP_INSTANCE_NAME

 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+is_public=$(ynh_app_setting_get --app=$app --key=is_public)

 #=================================================
 # CHECK VERSION
@ -34,21 +34,19 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..."

-# 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
-
 # If final_path doesn't exist, create it
 if [ -z "$final_path" ]; then
  final_path=/var/www/$app
  ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 fi

+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+  ynh_legacy_permissions_delete_all
+
+  ynh_app_setting_delete --app=$app --key=is_public
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
@ -63,18 +61,6 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors

-#=================================================
-# CHECK THE PATH
-#=================================================
-
-# Normalize the URL path syntax
-# N.B. : this is for app installations before YunoHost 2.7
-# where this value might be something like /foo/ or foo/
-# instead of /foo ....
-# If nobody installed your app before 2.7, then you may
-# safely remove this line
-path_url=$(ynh_normalize_url_path --path_url=$path_url)
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@ -90,7 +76,7 @@ fi
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading nginx web server configuration..."
+ynh_script_progression --message="Upgrading NGINX web server configuration..."

 # Create a dedicated nginx config
 ynh_add_nginx_config
@ -111,12 +97,12 @@ chown -R www-data: $final_path
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Upgrading SSOwat configuration..."
+ynh_script_progression --message="Upgrading configuring permissions..."

 # If app is public, add url to SSOWat conf as skipped_uris and read-only mode
 if [[ $is_public -eq 1 ]]; then
  # unprotected_uris allows SSO credentials to be passed anyway.
-  ynh_permission_update --permission "main" --add "visitors"
+  ynh_permission_update --permission="main" --add="visitors"
  # activate read-only
  ynh_replace_string --match_string='"readonly": false,' --replace_string='"readonly": true,' --target_file="$final_path/config.js"
 fi
@ -124,7 +110,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."

 ynh_systemd_action --service_name=nginx --action=reload