1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/webmin_ynh.git synced 2024-09-03 20:36:08 +02:00

Merge pull request #21 from YunoHost-Apps/testing

Upgrade to 1.984~ynh1
This commit is contained in:
yalh76 2022-01-19 19:52:16 +01:00 committed by GitHub
commit c1b3ff2b7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 57 additions and 64 deletions

View file

@ -15,9 +15,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
## Overview ## 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 **Shipped version:** 1.984~ynh1
@ -27,11 +27,10 @@ Web-based interface for system administration for Unix.
## Disclaimers / important information ## 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.
* 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
* Only **root** (system user) can connect * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed.
* 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
* Only **user** given permission at time of the installation can **access** the Webmin
## Documentation and resources ## Documentation and resources

View file

@ -11,9 +11,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
## Vue d'ensemble ## 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 **Version incluse :** 1.984~ynh1
@ -23,11 +23,10 @@ Interface Web d'administration système pour Unix.
## Avertissements / informations importantes ## 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.
* 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
* Only **root** (system user) can connect * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed.
* 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
* Only **user** given permission at time of the installation can **access** the Webmin
## Documentations et ressources ## Documentations et ressources

View file

@ -12,6 +12,8 @@
upgrade=1 upgrade=1
# 1.979~ynh1 # 1.979~ynh1
upgrade=1 from_commit=157310ca395c326add85d24fa397f7fd0cadefb1 upgrade=1 from_commit=157310ca395c326add85d24fa397f7fd0cadefb1
# 1.979~ynh2
upgrade=1 from_commit=99875e2b4c69f9ef22b05f565eeab52a8befb566
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
port_already_use=0 port_already_use=0
@ -21,4 +23,6 @@ Email=
Notification=none Notification=none
;;; Upgrade options ;;; Upgrade options
; commit=157310ca395c326add85d24fa397f7fd0cadefb1 ; commit=157310ca395c326add85d24fa397f7fd0cadefb1
name=1.979~ynh1. name=1.979~ynh1
; commit=99875e2b4c69f9ef22b05f565eeab52a8befb566
name=1.979~ynh2

View file

@ -1,24 +1,25 @@
location __PATH__ { location __PATH__ {
proxy_pass https://127.0.0.1:__PORT__/;
proxy_redirect off;
#Proxy Settings proxy_pass https://127.0.0.1:__PORT__/;
proxy_redirect off; 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_max_temp_file_size 0; #Proxy Settings
proxy_connect_timeout 90; proxy_redirect off;
proxy_send_timeout 90; proxy_set_header Host $host:$server_port; #this redirects the link without port no
proxy_read_timeout 90; proxy_set_header X-Real-IP $remote_addr;
proxy_buffer_size 128k; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_buffers 32 32k;
proxy_busy_buffers_size 256k;
proxy_temp_file_write_size 256k;
# Include SSOWAT user panel. proxy_max_temp_file_size 0;
include conf.d/yunohost_panel.conf.inc; proxy_connect_timeout 90;
more_clear_input_headers 'Accept-Encoding'; 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;
} }

1
doc/DESCRIPTION.md Normal file
View file

@ -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.

View file

@ -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.
* 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
* Only **root** (system user) can connect * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed.
* 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
* Only **user** given permission at time of the installation can **access** the Webmin

View file

@ -3,10 +3,10 @@
"id": "webmin", "id": "webmin",
"packaging_format": 1, "packaging_format": 1,
"description": { "description": {
"en": "Web-based interface for system administration for Unix.", "en": "Web-based interface for system administration for Unix",
"fr": "Interface Web d'administration système pour Unix." "fr": "Interface Web d'administration système pour Unix"
}, },
"version": "1.979~ynh2", "version": "1.984~ynh1",
"url": "http://www.webmin.com", "url": "http://www.webmin.com",
"upstream": { "upstream": {
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
@ -19,23 +19,21 @@
"email": "anmol@datamol.org" "email": "anmol@datamol.org"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.1.7" "yunohost": ">= 4.3.0"
}, },
"multi_instance": false, "multi_instance": false,
"services": [ "services": [
"nginx" "nginx"
], ],
"arguments": { "arguments": {
"install" : [ "install": [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain"
"example": "example.com"
}, },
{ {
"name": "admin", "name": "admin",
"type": "user", "type": "user"
"example": "johndoe"
} }
] ]
} }

View file

@ -42,14 +42,6 @@ ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB
systemctl disable $app.service --quiet systemctl disable $app.service --quiet
systemctl daemon-reload 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 # REMOVE NGINX CONFIGURATION
#================================================= #=================================================
@ -58,6 +50,14 @@ ynh_script_progression --message="Removing NGINX web server configuration..."
# Remove the dedicated NGINX config # Remove the dedicated NGINX config
ynh_remove_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 # GENERIC FINALIZATION
#================================================= #=================================================

View file

@ -32,14 +32,6 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
admin=$(ynh_app_setting_get --app=$app --key=admin) admin=$(ynh_app_setting_get --app=$app --key=admin)
port=$(ynh_app_setting_get --app=$app --key=port) 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 # STANDARD RESTORATION STEPS
#================================================= #=================================================