From 8f460e5b2e6cfa1c9efe9900220a6b8de08d34d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 4 Oct 2021 22:47:35 +0200
Subject: [PATCH 1/2] Testing (#16)

* 1.14.9
---
 .DS_Store                     | Bin 0 -> 6148 bytes
 .github/workflows/updater.sh  | 140 ++++++++++++++++++++++++++++++++++
 .github/workflows/updater.yml |  49 ++++++++++++
 README.md                     |   2 +-
 README_fr.md                  |   2 +-
 conf/app.src                  |   6 +-
 manifest.json                 |   5 +-
 7 files changed, 196 insertions(+), 8 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 .github/workflows/updater.sh
 create mode 100644 .github/workflows/updater.yml

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b5f9911dac78a8ffc8d9e67b686e5b6a6ca5830b
GIT binary patch
literal 6148
zcmeHK%}(1u5S|Tzcnd<VRH0Vt!BP)g5DEm5s}({|m8fb2hXTQtEn>;Ckz*%^D3Zkk
z@Br-<+Se$3ioQo*pfkH0RGRi!1ZYN@{l@dR_GfF?3jm^1h8qAj09dGmHHpJtgyN(#
zQZpVxp?dV8gdi9V&Vyton;j340eW{0Scfx+p@84sUlw5GXK<dxgQD5|A!>8=`Gtlh
zpUEY;ESHYGem3$7zbFSCKkwPEy*P{lKR=AaqQ4)dyGb;R(!KnhUqtywO5V@11QWFF
z2M2L9>e(-Lvb6ByG|E*!-Q(ymPQz@}$;vbwsC?60+3)?LkA37DH>wn)(vm%UWjt=K
zIh(E4WX&13+h}jKwkH#5S+7>#emE&FE<b&~y8iO@+l{ILfgh}r=LV<n9gRN-8G3n|
zWa$}3rd88yMrME+U<Mu~17<O^79Zu^^G!1Y%)tL-fYt{GmC!X<X;e!G4)ps-@j4+1
z+H{s6bPT!%D~%XI5xNvnmkM*l5V{=wj>&TkRvL9V2sJbIF*6HuLJ?|q^gAjYgsYK9
zW`G&E%fOtzv}ym}{rCC*ZV_KG1I)maVnEcpUblmfWcJpXhoimLK|Mt!p}b1tZ3!A`
iE5=;fieI8CLBB%=qHD0yh#nOF5l}Snzzp0g1HS;liDC8t

literal 0
HcmV?d00001

diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
new file mode 100644
index 0000000..7fe0c09
--- /dev/null
+++ b/.github/workflows/updater.sh
@@ -0,0 +1,140 @@
+#!/bin/bash
+
+#=================================================
+# PACKAGE UPDATING HELPER
+#=================================================
+
+# This script is meant to be run by GitHub Actions
+# The YunoHost-Apps organisation offers a template Action to run this script periodically
+# Since each app is different, maintainers can adapt its contents so as to perform
+# automatic actions when a new upstream release is detected.
+
+#=================================================
+# FETCHING LATEST RELEASE AND ITS ASSETS
+#=================================================
+
+# Fetching information
+current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
+repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
+# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
+version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
+assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'"))
+
+# Later down the script, we assume the version has only digits and dots
+# Sometimes the release name starts with a "v", so let's filter it out.
+# You may need more tweaks here if the upstream repository has different naming conventions.
+if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
+    version=${version:1}
+fi
+
+# Setting up the environment variables
+echo "Current version: $current_version"
+echo "Latest release from upstream: $version"
+echo "VERSION=$version" >> $GITHUB_ENV
+# For the time being, let's assume the script will fail
+echo "PROCEED=false" >> $GITHUB_ENV
+
+# Proceed only if the retrieved version is greater than the current one
+if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
+    echo "::warning ::No new version available"
+    exit 0
+# Proceed only if a PR for this new version does not already exist
+elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
+    echo "::warning ::A branch already exists for this update"
+    exit 0
+fi
+
+# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.)
+echo "${#assets[@]} available asset(s)"
+
+#=================================================
+# UPDATE SOURCE FILES
+#=================================================
+
+# Here we use the $assets variable to get the resources published in the upstream release.
+
+count=0
+
+# Let's loop over the array of assets URLs
+for asset_url in ${assets[@]}; do
+
+echo "Handling asset at $asset_url"
+
+# Assign the asset to a source file in conf/ directory
+# Here we base the source file name upon a unique keyword in the assets url (admin vs. update)
+# Leave $src empty to ignore the asset
+case $asset_url in
+  *".tar.gz")
+    src="app"
+    ;;
+  *)
+    src=""
+    ;;
+esac
+
+# If $src is not empty, let's process the asset
+if [ ! -z "$src" ]; then
+
+# Create the temporary directory
+tempdir="$(mktemp -d)"
+
+# Download sources and calculate checksum
+filename=${asset_url##*/}
+curl --silent -4 -L $asset_url -o "$tempdir/$filename"
+checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
+
+# Delete temporary directory
+rm -rf $tempdir
+
+# Get extension
+if [[ $filename == *.tar.gz ]]; then
+  extension=tar.gz
+else
+  extension=${filename##*.}
+fi
+
+# Rewrite source file
+cat <<EOT > conf/$src.src
+SOURCE_URL=$asset_url
+SOURCE_SUM=$checksum
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=$extension
+SOURCE_IN_SUBDIR=true
+SOURCE_EXTRACT=true
+SOURCE_FILENAME=mineweb.tar.gz
+EOT
+echo "... conf/$src.src updated"
+
+count=$((count+1))
+
+else
+echo "... asset ignored"
+fi
+
+done
+
+if [ $count == 0 ]; then
+    echo "::warning ::None of the assets were processed."
+    exit 0
+fi
+
+#=================================================
+# SPECIFIC UPDATE STEPS
+#=================================================
+
+# Any action on the app's source code can be done.
+# The GitHub Action workflow takes care of committing all changes after this script ends.
+
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+
+# Replace new version in manifest
+echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
+
+# No need to update the README, yunohost-bot takes care of it
+
+# The Action will proceed only if the PROCEED environment variable is set to true
+echo "PROCEED=true" >> $GITHUB_ENV
+exit 0
+
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
new file mode 100644
index 0000000..fd6ed60
--- /dev/null
+++ b/.github/workflows/updater.yml
@@ -0,0 +1,49 @@
+# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected.
+# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization.
+# This file should be enough by itself, but feel free to tune it to your needs.
+# It calls updater.sh, which is where you should put the app-specific update steps.
+name: Check for new upstream releases
+on:
+  # Allow to manually trigger the workflow
+  workflow_dispatch:
+  # Run it every day at 6:00 UTC
+  schedule:
+    - cron:  '0 6 * * *'
+jobs:
+  updater:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch the source code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Run the updater script
+        id: run_updater
+        run: |
+          # Setting up Git user
+          git config --global user.name 'yunohost-bot'
+          git config --global user.email 'yunohost-bot@users.noreply.github.com'
+          # Run the updater script
+          /bin/bash .github/workflows/updater.sh
+      - name: Commit changes
+        id: commit
+        if: ${{ env.PROCEED == 'true' }}
+        run: |
+          git commit -am "Upgrade to v$VERSION"
+      - name: Create Pull Request
+        id: cpr
+        if: ${{ env.PROCEED == 'true' }}
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update to version ${{ env.VERSION }}
+          committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
+          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: |
+            Upgrade to v${{ env.VERSION }}
+          draft: false
diff --git a/README.md b/README.md
index ff9e0b6..c8e80f6 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ MineWeb est un CMS (c'est-à-dire un système de gestion de contenu), en plus si
 Vous pourrez tenir vos joueurs au courant des actualités, leur faire acheter des articles sur la boutique... Vous pourrez personnaliser le CMS avec toutes sortes de thèmes ou plugins ! Ceux-ci sont disponibles sur le market ou peuvent être développés par vous-même.
 
 
-**Shipped version:** 1.14.5~ynh1
+**Shipped version:** 1.14.9~ynh1
 
 
 
diff --git a/README_fr.md b/README_fr.md
index a25c9f6..6c91f12 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -16,7 +16,7 @@ MineWeb est un CMS (c'est-à-dire un système de gestion de contenu), en plus si
 Vous pourrez tenir vos joueurs au courant des actualités, leur faire acheter des articles sur la boutique... Vous pourrez personnaliser le CMS avec toutes sortes de thèmes ou plugins ! Ceux-ci sont disponibles sur le market ou peuvent être développés par vous-même.
 
 
-**Version incluse :** 1.14.5~ynh1
+**Version incluse :** 1.14.9~ynh1
 
 
 
diff --git a/conf/app.src b/conf/app.src
index 8084a93..c9423fb 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/MineWeb/MineWebCMS/archive/v1.14.5.tar.gz
-SOURCE_SUM=60d70179aafc30f29d18218cd24d772c367e5644cf8fa5a3d8e18fcded21aad1
+SOURCE_URL=https://github.com/MineWeb/MineWebCMS/archive/v1.14.9.tar.gz
+SOURCE_SUM=5f2e180a466668c5e940610e3ad1abb0282f14b8d5ff41df95ab86123e62fcbf
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
 SOURCE_EXTRACT=true
-SOURCE_FILENAME=mineweb.tar.gz
\ No newline at end of file
+SOURCE_FILENAME=mineweb.tar.gz
diff --git a/manifest.json b/manifest.json
index cb78fd3..a3bbf8d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Customizable and intuitive CMS",
         "fr": "CMS personnalisable et intuitif"
     },
-    "version": "1.14.5~ynh1",
+    "version": "1.14.9~ynh1",
     "url": "https://mineweb.org/",
     "upstream": {
         "license": "AGPL-3.0-only",
@@ -31,8 +31,7 @@
     "arguments": {
         "install": [{
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",

From f1d472ec8b0a05ffbd07eee9acb4220207da922d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 17 Nov 2021 21:36:22 +0100
Subject: [PATCH 2/2] Testing (#18)

* 4.3 (#17)
---
 README.md          |  2 +-
 README_fr.md       |  2 +-
 conf/nginx.conf    |  5 -----
 manifest.json      |  4 ++--
 scripts/_common.sh |  2 +-
 scripts/install    | 12 ++++++++++--
 scripts/remove     |  8 ++++++++
 scripts/restore    |  9 ++++++++-
 scripts/upgrade    | 10 +++++++++-
 9 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index c8e80f6..b5b9d35 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Vous pourrez tenir vos joueurs au courant des actualités, leur faire acheter de
 
 * Official app website: https://mineweb.org/
 * Official admin documentation: https://docs.mineweb.org/
-* Upstream app code repository: ttps://github.com/MineWeb/MineWebCMS/
+* Upstream app code repository: https://github.com/MineWeb/MineWebCMS/
 * YunoHost documentation for this app: https://yunohost.org/app_mineweb
 * Report a bug: https://github.com/YunoHost-Apps/mineweb_ynh/issues
 
diff --git a/README_fr.md b/README_fr.md
index 6c91f12..055baac 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -28,7 +28,7 @@ Vous pourrez tenir vos joueurs au courant des actualités, leur faire acheter de
 
 * Site officiel de l'app : https://mineweb.org/
 * Documentation officielle de l'admin : https://docs.mineweb.org/
-* Dépôt de code officiel de l'app : ttps://github.com/MineWeb/MineWebCMS/
+* Dépôt de code officiel de l'app : https://github.com/MineWeb/MineWebCMS/
 * Documentation YunoHost pour cette app : https://yunohost.org/app_mineweb
 * Signaler un bug : https://github.com/YunoHost-Apps/mineweb_ynh/issues
 
diff --git a/conf/nginx.conf b/conf/nginx.conf
index c207bfc..45d830a 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/app/webroot/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
 
   try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string;
diff --git a/manifest.json b/manifest.json
index a3bbf8d..62abea2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,7 +12,7 @@
         "license": "AGPL-3.0-only",
         "website": "https://mineweb.org/",
         "admindoc": "https://docs.mineweb.org/",
-        "code": "ttps://github.com/MineWeb/MineWebCMS/"
+        "code": "https://github.com/MineWeb/MineWebCMS/"
     },
     "license": "AGPL-3.0-only",
     "maintainer": {
@@ -20,7 +20,7 @@
         "email": "liberodark@gmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index df46335..b88b4f5 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,7 +8,7 @@
 YNH_PHP_VERSION="7.3"
 
 # dependencies used by the app
-extra_php_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl"
+pkg_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 6889207..73c6de3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -26,6 +26,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
+phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -47,6 +48,14 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
+ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion
+
+#=================================================
+# INSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Installing dependencies..." --weight=1
+
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -94,8 +103,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --package="$extra_php_dependencies"
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+ynh_add_fpm_config
 
 #=================================================
 # MODIFY A CONFIG FILE
diff --git a/scripts/remove b/scripts/remove
index 63f8bea..0351066 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -36,6 +36,14 @@ ynh_script_progression --message="Removing the MySQL database..." --weight=4
 # Remove a database if it exists, along with the associated user
 ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name
 
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Removing dependencies..." --weight=1
+
+# Remove metapackage and its dependencies
+ynh_remove_app_dependencies
+
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index ec30096..1c7e69c 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -67,10 +67,17 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
+ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-ynh_add_fpm_config --package="$extra_php_dependencies"
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # RESTORE THE MYSQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index d408e6d..1989288 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -101,17 +101,25 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..." --weight=1
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config
 
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
+ynh_script_progression --message="Updating a configuration file..."--weight=1
 
 ynh_add_config --template="../conf/database.php" --destination="$final_path/app/Config/database.php"