mirror of
https://github.com/YunoHost-Apps/webmin_ynh.git
synced 2024-09-03 20:36:08 +02:00
Merge pull request #19 from YunoHost-Apps/testing
Trying to fix bullseye
This commit is contained in:
commit
99875e2b4c
9 changed files with 40 additions and 16 deletions
|
@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
|||
|
||||
Web-based interface for system administration for Unix.
|
||||
|
||||
**Shipped version:** 1.979~ynh1
|
||||
**Shipped version:** 1.979~ynh2
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
|
|||
|
||||
Interface Web d'administration système pour Unix.
|
||||
|
||||
**Version incluse :** 1.979~ynh1
|
||||
**Version incluse :** 1.979~ynh2
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;; Test complet
|
||||
; Manifest
|
||||
domain="domain.tld" (DOMAIN)
|
||||
admin="john" (USER)
|
||||
domain="domain.tld"
|
||||
admin="john"
|
||||
; Checks
|
||||
pkg_linter=1
|
||||
setup_sub_dir=0
|
||||
|
@ -10,6 +10,8 @@
|
|||
setup_private=0
|
||||
setup_public=0
|
||||
upgrade=1
|
||||
# 1.979~ynh1
|
||||
upgrade=1 from_commit=157310ca395c326add85d24fa397f7fd0cadefb1
|
||||
backup_restore=1
|
||||
multi_instance=0
|
||||
port_already_use=0
|
||||
|
@ -17,3 +19,6 @@
|
|||
;;; Options
|
||||
Email=
|
||||
Notification=none
|
||||
;;; Upgrade options
|
||||
; commit=157310ca395c326add85d24fa397f7fd0cadefb1
|
||||
name=1.979~ynh1.
|
||||
|
|
|
@ -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~ynh1",
|
||||
"version": "1.979~ynh2",
|
||||
"url": "http://www.webmin.com",
|
||||
"upstream": {
|
||||
"license": "BSD-3-Clause",
|
||||
|
@ -18,7 +18,7 @@
|
|||
"name": "Anmol Sharma",
|
||||
"email": "anmol@datamol.org"
|
||||
},
|
||||
"requirements": {
|
||||
"requirements": {
|
||||
"yunohost": ">= 4.1.7"
|
||||
},
|
||||
"multi_instance": false,
|
||||
|
|
|
@ -62,7 +62,7 @@ fi
|
|||
#=================================================
|
||||
ynh_script_progression --message="Stopping a systemd service..."
|
||||
|
||||
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB"
|
||||
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB" --log_path="systemd"
|
||||
|
||||
#=================================================
|
||||
# MODIFY URL IN NGINX CONF
|
||||
|
@ -99,7 +99,7 @@ fi
|
|||
ynh_script_progression --message="Starting a systemd service..."
|
||||
|
||||
# Start a systemd service
|
||||
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB"
|
||||
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB" --log_path="systemd"
|
||||
|
||||
#=================================================
|
||||
# RELOAD NGINX
|
||||
|
|
|
@ -98,7 +98,7 @@ ynh_script_progression --message="Configuring a systemd service..."
|
|||
|
||||
# Create a dedicated systemd config
|
||||
systemctl daemon-reload
|
||||
systemctl enable $app --quiet
|
||||
systemctl enable $app.service --quiet
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
|
@ -115,7 +115,7 @@ yunohost service add $app --description="Webmin Daemon"
|
|||
ynh_script_progression --message="Starting a systemd service..."
|
||||
|
||||
# Start a systemd service
|
||||
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB"
|
||||
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB" --log_path="systemd"
|
||||
|
||||
#=================================================
|
||||
# SETUP SSOWAT
|
||||
|
|
|
@ -38,7 +38,9 @@ fi
|
|||
ynh_script_progression --message="Stopping and removing the systemd service..."
|
||||
|
||||
# Remove the dedicated systemd config
|
||||
ynh_remove_systemd_config
|
||||
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB" --log_path="systemd"
|
||||
systemctl disable $app.service --quiet
|
||||
systemctl daemon-reload
|
||||
|
||||
#=================================================
|
||||
# REMOVE DEPENDENCIES
|
||||
|
@ -46,7 +48,7 @@ ynh_remove_systemd_config
|
|||
ynh_script_progression --message="Removing dependencies..."
|
||||
|
||||
# Remove metapackage and its dependencies
|
||||
ynh_remove_app_dependencies
|
||||
ynh_exec_warn_less ynh_remove_app_dependencies
|
||||
|
||||
#=================================================
|
||||
# REMOVE NGINX CONFIGURATION
|
||||
|
|
|
@ -67,6 +67,14 @@ ynh_script_progression --message="Restoring various files..."
|
|||
|
||||
ynh_restore_file --origin_path="/etc/webmin/miniserv.conf"
|
||||
|
||||
#=================================================
|
||||
# RESTORE SYSTEMD
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the systemd configuration..."
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl enable $app.service --quiet
|
||||
|
||||
#=================================================
|
||||
# INTEGRATE SERVICE IN YUNOHOST
|
||||
#=================================================
|
||||
|
@ -79,7 +87,7 @@ yunohost service add $app --description="Webmin Daemon"
|
|||
#=================================================
|
||||
ynh_script_progression --message="Starting a systemd service..."
|
||||
|
||||
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB"
|
||||
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB" --log_path="systemd"
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
|
|
|
@ -49,7 +49,7 @@ ynh_abort_if_errors
|
|||
#=================================================
|
||||
ynh_script_progression --message="Stopping a systemd service..."
|
||||
|
||||
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB"
|
||||
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB" --log_path="systemd"
|
||||
|
||||
#=================================================
|
||||
# ENSURE DOWNWARD COMPATIBILITY
|
||||
|
@ -81,7 +81,7 @@ ynh_backup_if_checksum_is_different --file="/etc/webmin/miniserv.conf"
|
|||
ynh_install_extra_app_dependencies --repo="deb https://download.webmin.com/download/repository sarge contrib" --package="webmin" --key="https://download.webmin.com/jcameron-key.asc"
|
||||
|
||||
#=================================================
|
||||
# INSTALL WEBMIN
|
||||
# SPECIFIC UPGRADE
|
||||
#=================================================
|
||||
# UPDATE A CONFIG FILE
|
||||
#=================================================
|
||||
|
@ -93,6 +93,15 @@ ynh_replace_string --match_string="listen=10000" --replace_string="listen=$port"
|
|||
# Recalculate and store the checksum of the file for the next upgrade.
|
||||
ynh_store_file_checksum --file="/etc/webmin/miniserv.conf"
|
||||
|
||||
#=================================================
|
||||
# SETUP SYSTEMD
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading systemd configuration..."
|
||||
|
||||
# Create a dedicated systemd config
|
||||
systemctl daemon-reload
|
||||
systemctl enable $app.service --quiet
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
#=================================================
|
||||
|
@ -107,7 +116,7 @@ yunohost service add $app --description="Webmin Daemon"
|
|||
#=================================================
|
||||
ynh_script_progression --message="Starting a systemd service..."
|
||||
|
||||
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB"
|
||||
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB" --log_path="systemd"
|
||||
|
||||
#=================================================
|
||||
# RELOAD NGINX
|
||||
|
|
Loading…
Add table
Reference in a new issue