From 21d3ff64b06a36c03dc33af596b86684140e0fd3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Mar 2022 08:20:13 +0100 Subject: [PATCH 1/2] 5.2.11 --- conf/app.src | 4 ++-- conf/nginx.conf | 5 ----- manifest.json | 4 ++-- updater.yml | 49 ------------------------------------------------- 4 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 updater.yml diff --git a/conf/app.src b/conf/app.src index cd9fd8d..2ab69c6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/PHPBoost/PHPBoost/archive/refs/tags/phpboost-5.2.10.tar.gz -SOURCE_SUM=c9b6ff50b436dae69308fa92927a145f2b1b2491638a1f2e078af514bbbcea6b +SOURCE_URL=https://github.com/PHPBoost/PHPBoost/archive/refs/tags/phpboost-5.2.11.tar.gz +SOURCE_SUM=732e95714c3d14b60abfd0d1cd37d38df18a730dff9e347e02a4fa6b048ff40c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index cfdefca..179ee75 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; try_files $uri $uri/ index.php; diff --git a/manifest.json b/manifest.json index e43cf6d..2ba200b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "French and free content management system (CMS)", "fr": "système de gestion de contenu (CMS) français et libre" }, - "version": "5.2.10~ynh3", + "version": "5.2.11~ynh1", "url": "https://www.phpboost.com/", "upstream": { "license": "GPL-3.0-only", @@ -21,7 +21,7 @@ "email": "liberodark@gmail.com" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/updater.yml b/updater.yml deleted file mode 100644 index fb72ba0..0000000 --- a/updater.yml +++ /dev/null @@ -1,49 +0,0 @@ -# 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 ' - author: 'yunohost-bot ' - signoff: false - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false From 49d3d51a0372dfd15a568a21ca74ea01dbadfb69 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 6 Mar 2022 07:20:18 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea35b1e..544d150 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in French and free content management system (CMS) -**Shipped version:** 5.2.10~ynh3 +**Shipped version:** 5.2.11~ynh1 **Demo:** https://demo.phpboost.com/ diff --git a/README_fr.md b/README_fr.md index c901cfd..edd2003 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour système de gestion de contenu (CMS) français et libre -**Version incluse :** 5.2.10~ynh3 +**Version incluse :** 5.2.11~ynh1 **Démo :** https://demo.phpboost.com/