Merge pull request #6 from YunoHost-Apps/testing

Testing
2024-09-03 20:16:27 +02:00 · 2023-03-29 12:34:43 +02:00 · 2023-03-29 12:34:43 +02:00 · 75ffb80bbb
commit 75ffb80bbb
parent c6f74fc84d 8e0c31edce
7 changed files with 29 additions and 42 deletions
--- a/.github/workflows/updater.yml
+++ b/.github/workflows/updater.yml
@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Fetch the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
      - name: Run the updater script
@ -33,7 +33,7 @@ jobs:
      - name: Create Pull Request
        id: cpr
        if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          commit-message: Update to version ${{ env.VERSION }}
--- a/README.md
+++ b/README.md
@ -5,7 +5,8 @@ It shall NOT be edited by hand.

 # Satdress for YunoHost

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

 *[Lire ce readme en français.](./README_fr.md)*
@ -18,8 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Federated Lightning Address server anyone can self-host to receive Lightning payments at you@yourdomain.com noncustodially.


-**Shipped version:** 0.7.0~ynh2
-
+**Shipped version:** 0.7.2~ynh1

 **Demo:** https://github.com/nbd-wtf/satdress

@ -37,7 +37,6 @@ Federated Lightning Address server anyone can self-host to receive Lightning pay
    * Promotes Crypto. Crypto products are unregulated and can be highly risky. There may be no regulatory recourse for any loss from such transactions.
 ## Documentation and resources

-* Official app website: <https://github.com/nbd-wtf/satdress>
 * Official user documentation: <https://github.com/nbd-wtf/satdresss>
 * Official admin documentation: <https://github.com/nbd-wtf/satdress>
 * Upstream app code repository: <https://github.com/nbd-wtf/satdress>
--- a/README_fr.md
+++ b/README_fr.md
@ -5,27 +5,27 @@ It shall NOT be edited by hand.

 # Satdress pour YunoHost

-[![Niveau d'intégration](https://dash.yunohost.org/integration/satdress.svg)](https://dash.yunohost.org/appci/app/satdress) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/satdress.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/satdress.maintain.svg)  
+[![Niveau d’intégration](https://dash.yunohost.org/integration/satdress.svg)](https://dash.yunohost.org/appci/app/satdress) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/satdress.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/satdress.maintain.svg)
+
 [![Installer Satdress avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=satdress)

 *[Read this readme in english.](./README.md)*

-> *Ce package vous permet d'installer Satdress 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.*
+> *Ce package vous permet d’installer Satdress 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
+## Vue d’ensemble

 Federated Lightning Address server anyone can self-host to receive Lightning payments at you@yourdomain.com noncustodially.


-**Version incluse :** 0.7.0~ynh2
-
+**Version incluse :** 0.7.2~ynh1

 **Démo :** https://github.com/nbd-wtf/satdress

-## Captures d'écran
+## Captures d’écran

-![Capture d'écran de Satdress](./doc/screenshots/example.jpg)
+![Capture d’écran de Satdress](./doc/screenshots/example.jpg)

 ## Avertissements / informations importantes

@ -37,10 +37,9 @@ Federated Lightning Address server anyone can self-host to receive Lightning pay
    * Promotes Crypto. Crypto products are unregulated and can be highly risky. There may be no regulatory recourse for any loss from such transactions.
 ## Documentations et ressources

-* Site officiel de l'app : <https://github.com/nbd-wtf/satdress>
 * Documentation officielle utilisateur : <https://github.com/nbd-wtf/satdresss>
-* Documentation officielle de l'admin : <https://github.com/nbd-wtf/satdress>
-* Dépôt de code officiel de l'app : <https://github.com/nbd-wtf/satdress>
+* Documentation officielle de l’admin : <https://github.com/nbd-wtf/satdress>
+* Dépôt de code officiel de l’app : <https://github.com/nbd-wtf/satdress>
 * Documentation YunoHost pour cette app : <https://yunohost.org/app_satdress>
 * Signaler un bug : <https://github.com/YunoHost-Apps/satdress_ynh/issues>

@ -56,4 +55,4 @@ ou
 sudo yunohost app upgrade satdress -u https://github.com/YunoHost-Apps/satdress_ynh/tree/testing --debug
 ```

-**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
--- a/conf/app.src
+++ b/conf/app.src
@ -1,7 +1,6 @@
-SOURCE_URL=https://github.com/nbd-wtf/satdress/archive/refs/tags/v0.7.0.tar.gz
-SOURCE_SUM=fe1eea19cfda37433a6b08984eeb408815e214fb1a76a3a1c1d6ba344196dd86
+SOURCE_URL=https://github.com/nbd-wtf/satdress/archive/refs/tags/v0.7.2.tar.gz
+SOURCE_SUM=1f7ec9987ee5d84aa8da6e96f8a5028fe1e391b6cdb3fd3cce3b637701645972
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true
--- a/manifest.json
+++ b/manifest.json
@ -3,13 +3,13 @@
    "id": "satdress",
    "packaging_format": 1,
    "description": {
-        "en": "Federated Lightning addresses server."
+        "en": "Federated Lightning addresses server",
+        "fr": "Serveur d'adresses Lightning fédéré"
    },
-    "version": "0.7.0~ynh2",
+    "version": "0.7.2~ynh1",
    "url": "https://github.com/nbd-wtf/satdress",
    "upstream": {
        "license": "MIT",
-        "website": "https://github.com/nbd-wtf/satdress",
        "demo": "https://github.com/nbd-wtf/satdress",
        "admindoc": "https://github.com/nbd-wtf/satdress",
        "userdoc": "https://github.com/nbd-wtf/satdresss",
@ -21,7 +21,7 @@
        "email": "satdress@navan.email"
    },
    "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.1.15"
    },
    "multi_instance": true,
    "services": [
--- a/scripts/change_url
+++ b/scripts/change_url
@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+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)
@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1
+ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1

 # Backup the current version of the app
 ynh_backup_before_upgrade
@ -67,14 +67,14 @@ fi
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --time --weight=1
+ynh_script_progression --message="Stopping a systemd service..." --weight=1

 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"

 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1

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

@ -105,14 +105,14 @@ fi
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=1
+ynh_script_progression --message="Starting a systemd service..." --weight=1

 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"

 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1

 ynh_systemd_action --service_name=nginx --action=reload

@ -120,4 +120,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Change of URL completed for $app" --time --last
+ynh_script_progression --message="Change of URL completed for $app" --last
--- a/scripts/remove
+++ b/scripts/remove
@ -65,16 +65,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config

-#=================================================
-# CLOSE A PORT
-#=================================================
-
-if yunohost firewall list | grep -q "\- $port$"
-then
-	ynh_script_progression --message="Closing port $port..." --weight=1
-	ynh_exec_warn_less yunohost firewall disallow TCP $port
-fi
-
 #=================================================
 # SPECIFIC REMOVE
 #=================================================