From d425a2e930745e281d798c3f916e353e05e6b53b 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 19:06:00 +0100 Subject: [PATCH] Testing (#42) * Upgrade to version 2.013 (#41) * Upgrade to v2.013 * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot * Auto-update README * Update manifest.json * Update upgrade * Update nginx.conf * Update app.src * Update DISCLAIMER.md * Auto-update README --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 12 +++++++++--- README_fr.md | 28 +++++++++++++++++----------- conf/app.src | 4 ++-- conf/nginx.conf | 3 ++- doc/DISCLAIMER.md | 7 +++++++ manifest.json | 4 ++-- scripts/upgrade | 1 - 7 files changed, 39 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 4f5e317..8fddb2a 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)* @@ -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 @@ -31,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 2003026..1daa5de 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 @@ -31,10 +30,17 @@ 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 : -* 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 +56,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/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 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; 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 +``` diff --git a/manifest.json b/manifest.json index ddc959b..0e94a29 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", @@ -19,7 +19,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ 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)