From dfc6a01ac00d7c2d5116cf3dca8bf13483cfcdb8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 09:41:45 +0100 Subject: [PATCH 01/10] Upgrade to version 2.013 (#41) * Upgrade to v2.013 * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 3 +-- README_fr.md | 21 ++++++++++----------- manifest.json | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 4f5e317..018b07f 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Webmin is a web-based interface for system administration for Unix. Using any modern web browser, you can setup user accounts, Apache, DNS, file sharing and much more. Webmin removes the need to manually edit Unix configuration files like `/etc/passwd`, and lets you manage a system from the console or remotely. -**Shipped version:** 2.001~ynh1 - +**Shipped version:** 2.013~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 2003026..1d0aa47 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,24 +5,23 @@ It shall NOT be edited by hand. # Webmin pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/webmin.svg)](https://dash.yunohost.org/appci/app/webmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/webmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/webmin.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/webmin.svg)](https://dash.yunohost.org/appci/app/webmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/webmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/webmin.maintain.svg) [![Installer Webmin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webmin) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Webmin 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 Webmin 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 Webmin is a web-based interface for system administration for Unix. Using any modern web browser, you can setup user accounts, Apache, DNS, file sharing and much more. Webmin removes the need to manually edit Unix configuration files like `/etc/passwd`, and lets you manage a system from the console or remotely. -**Version incluse :** 2.001~ynh1 +**Version incluse :** 2.013~ynh1 +## Captures d’écran -## Captures d'écran - -![Capture d'écran de Webmin](./doc/screenshots/screenshot1.gif) +![Capture d’écran de Webmin](./doc/screenshots/screenshot1.gif) ## Avertissements / informations importantes @@ -33,8 +32,8 @@ Webmin is a web-based interface for system administration for Unix. Using any mo ## Documentations et ressources -* Site officiel de l'app : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -50,4 +49,4 @@ ou sudo yunohost app upgrade webmin -u https://github.com/YunoHost-Apps/webmin_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file diff --git a/manifest.json b/manifest.json index ddc959b..1aea4ff 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web-based interface for system administration for Unix", "fr": "Interface Web d'administration système pour Unix" }, - "version": "2.001~ynh1", + "version": "2.013~ynh1", "url": "http://www.webmin.com", "upstream": { "license": "BSD-3-Clause", From bb1670e8a732991939bea6736af609ae8ca6b35b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 27 Jan 2023 08:41:50 +0000 Subject: [PATCH 02/10] 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 018b07f..2549582 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Webmin for YunoHost -[![Integration level](https://dash.yunohost.org/integration/webmin.svg)](https://dash.yunohost.org/appci/app/webmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/webmin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/webmin.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/webmin.svg)](https://dash.yunohost.org/appci/app/webmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/webmin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/webmin.maintain.svg) [![Install Webmin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webmin) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 1d0aa47..a571562 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Webmin pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/webmin.svg)](https://dash.yunohost.org/appci/app/webmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/webmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/webmin.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/webmin.svg)](https://dash.yunohost.org/appci/app/webmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/webmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/webmin.maintain.svg) [![Installer Webmin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webmin) *[Read this readme in english.](./README.md)* From 36fb91e0138a6761615ab11a4fb4ce77ae130309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Jan 2023 09:43:05 +0100 Subject: [PATCH 03/10] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index ddc959b..a8190fb 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ From 43f39c1fd4246854aedba7606fda65f494b0c577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Jan 2023 09:44:44 +0100 Subject: [PATCH 04/10] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0862d4b..4a9ff67 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,6 @@ port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) From 00d60af0de5ad7748350b548cec9a10a5a6f726b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Jan 2023 09:55:34 +0100 Subject: [PATCH 05/10] Update nginx.conf --- conf/nginx.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 2a8a496..5b8e8e1 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,5 @@ -location __PATH__ { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { proxy_pass https://127.0.0.1:__PORT__/; proxy_redirect off; From 8b6d92b7856786393707381430f33251b4bf50c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Jan 2023 09:57:08 +0100 Subject: [PATCH 06/10] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 51502a4..4b4290b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/webmin/webmin/releases/download/2.001/webmin_2.001_all.deb -SOURCE_SUM=1bac754988537fd168cbf15322aed5a7087271269dea5816061f008817136d26 +SOURCE_URL=https://github.com/webmin/webmin/releases/download/2.013/webmin_2.013_all.deb +SOURCE_SUM=8e33988bb7db78fde09067097c8ddff856bf1171e8bdfb9a460536857d360366 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false From fa21c2e92eef727cf7cab2570608e86197da0420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Jan 2023 10:43:48 +0100 Subject: [PATCH 07/10] Update DISCLAIMER.md --- doc/DISCLAIMER.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index bd8afd3..e7669c2 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -2,3 +2,10 @@ * Only **user** given permission at time of the installation can **access** the Webmin login interface * To login to webmin, use root and root password * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. + +### Fix username and password + +If you can't connect you can fix the password of the user running: +``` +/usr/share/webmin/changepass.pl /etc/webmin root newpassword +``` From 4d4d4873935f2940aa943fbfd158a36748e2c69a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 27 Jan 2023 09:43:56 +0000 Subject: [PATCH 08/10] Auto-update README --- README.md | 7 +++++++ README_fr.md | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/README.md b/README.md index 2549582..8fddb2a 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,13 @@ Webmin is a web-based interface for system administration for Unix. Using any mo * To login to webmin, use root and root password * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. +### Fix username and password + +If you can't connect you can fix the password of the user running: +``` +/usr/share/webmin/changepass.pl /etc/webmin root newpassword +``` + ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index a571562..1daa5de 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,6 +30,13 @@ Webmin is a web-based interface for system administration for Unix. Using any mo * To login to webmin, use root and root password * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. +### Fix username and password + +If you can't connect you can fix the password of the user running: +``` +/usr/share/webmin/changepass.pl /etc/webmin root newpassword +``` + ## Documentations et ressources * Site officiel de l’app : From d8b7519efbf93a68d25b541f9d61af33459ee400 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 15:22:43 +0100 Subject: [PATCH 09/10] Upgrade to version 2.021 (#47) * Upgrade to v2.021 * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 3 ++- README_fr.md | 3 ++- manifest.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8fddb2a..a0cdaa1 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Webmin for YunoHost [![Integration level](https://dash.yunohost.org/integration/webmin.svg)](https://dash.yunohost.org/appci/app/webmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/webmin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/webmin.maintain.svg) + [![Install Webmin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webmin) *[Lire ce readme en français.](./README_fr.md)* @@ -17,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Webmin is a web-based interface for system administration for Unix. Using any modern web browser, you can setup user accounts, Apache, DNS, file sharing and much more. Webmin removes the need to manually edit Unix configuration files like `/etc/passwd`, and lets you manage a system from the console or remotely. -**Shipped version:** 2.013~ynh1 +**Shipped version:** 2.021~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1daa5de..42cb651 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Webmin pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/webmin.svg)](https://dash.yunohost.org/appci/app/webmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/webmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/webmin.maintain.svg) + [![Installer Webmin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webmin) *[Read this readme in english.](./README.md)* @@ -17,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Webmin is a web-based interface for system administration for Unix. Using any modern web browser, you can setup user accounts, Apache, DNS, file sharing and much more. Webmin removes the need to manually edit Unix configuration files like `/etc/passwd`, and lets you manage a system from the console or remotely. -**Version incluse :** 2.013~ynh1 +**Version incluse :** 2.021~ynh1 ## Captures d’écran diff --git a/manifest.json b/manifest.json index 0e94a29..f81e1ee 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web-based interface for system administration for Unix", "fr": "Interface Web d'administration système pour Unix" }, - "version": "2.013~ynh1", + "version": "2.021~ynh1", "url": "http://www.webmin.com", "upstream": { "license": "BSD-3-Clause", From 7cc254a03e947cd1504f5ee0a5961a1be2274f4d Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Wed, 22 Mar 2023 15:23:15 +0100 Subject: [PATCH 10/10] Upgrade auto-updater (#43) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index fb72ba0..a56d7cb 100644 --- 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 }}