From c331c652f00c740e812235ad95ac6ce1548c1cfd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 3 Sep 2021 09:15:14 +0200 Subject: [PATCH 1/6] Add description --- doc/DESCRIPTION.md | 1 + manifest.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 doc/DESCRIPTION.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..dd0e880 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +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. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 94dfc80..f8ef3bf 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "webmin", "packaging_format": 1, "description": { - "en": "Web-based interface for system administration for Unix.", - "fr": "Interface Web d'administration système pour Unix." + "en": "Web-based interface for system administration for Unix", + "fr": "Interface Web d'administration système pour Unix" }, "version": "1.979~ynh2", "url": "http://www.webmin.com", From ed88a5f4adf20de764baeb31c461eba2ba81a4de Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 3 Sep 2021 07:15:23 +0000 Subject: [PATCH 2/6] 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 d3465d3..ffe5712 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Web-based interface for system administration for Unix. +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:** 1.979~ynh2 diff --git a/README_fr.md b/README_fr.md index 381f42c..7a4ed75 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Interface Web d'administration système pour Unix. +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 :** 1.979~ynh2 From ca8337fedbbae0a1a51db987862ba3a576a8aada Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 14 Nov 2021 23:37:21 +0100 Subject: [PATCH 3/6] Update manifest.json --- manifest.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index f8ef3bf..10f653a 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.3" }, "multi_instance": false, "services": [ @@ -29,13 +29,11 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" } ] } From 3aa78386ca5959ccd27214b1fb5f3287fb8e03ea Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 14 Jan 2022 22:34:13 +0100 Subject: [PATCH 4/6] Apply last example_ynh --- conf/nginx.conf | 39 ++++++++++++++++++++------------------- doc/DISCLAIMER.md | 9 ++++----- manifest.json | 4 ++-- scripts/remove | 16 ++++++++-------- scripts/restore | 8 -------- 5 files changed, 34 insertions(+), 42 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 50323b9..2a8a496 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,24 +1,25 @@ location __PATH__ { - - proxy_pass https://127.0.0.1:__PORT__/; - proxy_redirect off; - #Proxy Settings - proxy_redirect off; - proxy_set_header Host $host:$server_port; #this redirects the link without port no - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass https://127.0.0.1:__PORT__/; + proxy_redirect off; - proxy_max_temp_file_size 0; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; - proxy_buffer_size 128k; - proxy_buffers 32 32k; - proxy_busy_buffers_size 256k; - proxy_temp_file_write_size 256k; + #Proxy Settings + proxy_redirect off; + proxy_set_header Host $host:$server_port; #this redirects the link without port no + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; - more_clear_input_headers 'Accept-Encoding'; + proxy_max_temp_file_size 0; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffer_size 128k; + proxy_buffers 32 32k; + proxy_busy_buffers_size 256k; + proxy_temp_file_write_size 256k; + + more_clear_input_headers 'Accept-Encoding'; + + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 7510d4d..51d68e7 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,5 +1,4 @@ -* Other infos that people should be aware of, such as: - * This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values. - * Only **root** (system user) can connect - * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. - * Only **user** given permission at time of the installation can **access** the Webmin +* This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values. +* Only **root** (system user) can connect +* Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. +* Only **user** given permission at time of the installation can **access** the Webmin diff --git a/manifest.json b/manifest.json index 10f653a..4eb9a5b 100644 --- a/manifest.json +++ b/manifest.json @@ -19,14 +19,14 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 4.2.3" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" diff --git a/scripts/remove b/scripts/remove index bc5f213..33ade03 100644 --- a/scripts/remove +++ b/scripts/remove @@ -42,14 +42,6 @@ ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB systemctl disable $app.service --quiet systemctl daemon-reload -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." - -# Remove metapackage and its dependencies -ynh_exec_warn_less ynh_remove_app_dependencies - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -58,6 +50,14 @@ ynh_script_progression --message="Removing NGINX web server configuration..." # Remove the dedicated NGINX config ynh_remove_nginx_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." + +# Remove metapackage and its dependencies +ynh_exec_warn_less ynh_remove_app_dependencies + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index e4a7bb6..2938727 100755 --- a/scripts/restore +++ b/scripts/restore @@ -32,14 +32,6 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) port=$(ynh_app_setting_get --app=$app --key=port) -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." - -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" - #================================================= # STANDARD RESTORATION STEPS #================================================= From 3e7bc63b004d6fcb5e9a7f38848df01e6161338f Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 14 Jan 2022 22:36:39 +0100 Subject: [PATCH 5/6] Upgrade to 1.984~ynh1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 6 +++++- manifest.json | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ffe5712..dcc8430 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 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:** 1.979~ynh2 +**Shipped version:** 1.984~ynh1 diff --git a/README_fr.md b/README_fr.md index 7a4ed75..4421b5c 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 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 :** 1.979~ynh2 +**Version incluse :** 1.984~ynh1 diff --git a/check_process b/check_process index 12230c0..c64d406 100644 --- a/check_process +++ b/check_process @@ -12,6 +12,8 @@ upgrade=1 # 1.979~ynh1 upgrade=1 from_commit=157310ca395c326add85d24fa397f7fd0cadefb1 + # 1.979~ynh2 + upgrade=1 from_commit=99875e2b4c69f9ef22b05f565eeab52a8befb566 backup_restore=1 multi_instance=0 port_already_use=0 @@ -21,4 +23,6 @@ Email= Notification=none ;;; Upgrade options ; commit=157310ca395c326add85d24fa397f7fd0cadefb1 - name=1.979~ynh1. + name=1.979~ynh1 + ; commit=99875e2b4c69f9ef22b05f565eeab52a8befb566 + name=1.979~ynh2 diff --git a/manifest.json b/manifest.json index 4eb9a5b..340ebae 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": "1.979~ynh2", + "version": "1.984~ynh1", "url": "http://www.webmin.com", "upstream": { "license": "BSD-3-Clause", From fd4d16f25e475e846c0cd40acf5923e1bc8295c1 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 14 Jan 2022 21:36:46 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 9 ++++----- README_fr.md | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index dcc8430..096cb24 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,10 @@ Webmin is a web-based interface for system administration for Unix. Using any mo ## Disclaimers / important information -* Other infos that people should be aware of, such as: - * This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values. - * Only **root** (system user) can connect - * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. - * Only **user** given permission at time of the installation can **access** the Webmin +* This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values. +* Only **root** (system user) can connect +* Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. +* Only **user** given permission at time of the installation can **access** the Webmin ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 4421b5c..f9c38bf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,11 +23,10 @@ Webmin is a web-based interface for system administration for Unix. Using any mo ## Avertissements / informations importantes -* Other infos that people should be aware of, such as: - * This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values. - * Only **root** (system user) can connect - * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. - * Only **user** given permission at time of the installation can **access** the Webmin +* This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values. +* Only **root** (system user) can connect +* Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. +* Only **user** given permission at time of the installation can **access** the Webmin ## Documentations et ressources