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 #6 from YunoHost-Apps/example_ynh

adding Line Match
This commit is contained in:
yalh76 2020-10-07 23:34:52 +02:00 committed by GitHub
commit 9357213230
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 11 deletions

View file

@ -16,7 +16,7 @@
"requirements": {
"yunohost": ">= 3.5"
},
"multi_instance": "false",
"multi_instance": false,
"services": [
"nginx"
],

View file

@ -62,7 +62,7 @@ fi
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB"
#=================================================
# MODIFY URL IN NGINX CONF
@ -101,7 +101,7 @@ fi
ynh_script_progression --message="Starting a systemd service..."
# Start a systemd service
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB"
#=================================================
# RELOAD NGINX

View file

@ -101,7 +101,7 @@ ynh_store_file_checksum --file="/etc/webmin/miniserv.conf"
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --description "Webmin Daemon" --log "/var/log/$app/$app.log"
yunohost service add $app --description "Webmin Daemon"
#=================================================
# START SYSTEMD SERVICE
@ -109,7 +109,7 @@ yunohost service add $app --description "Webmin Daemon" --log "/var/log/$app/$ap
ynh_script_progression --message="Starting a systemd service..."
# Start a systemd service
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB"
#=================================================
# SETUP SSOWAT

View file

@ -75,14 +75,14 @@ ynh_restore_file --origin_path="/etc/webmin/miniserv.conf"
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --description "Webmin Daemon" --log "/var/log/$app/$app.log"
yunohost service add $app --description "Webmin Daemon"
#=================================================
# START SYSTEMD SERVICE
#=================================================
ynh_script_progression --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB"
#=================================================
# GENERIC FINALIZATION

View file

@ -21,6 +21,20 @@ 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)
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
# Backup the current version of the app
ynh_backup_before_upgrade
ynh_clean_setup () {
# restore it if the upgrade fails
ynh_restore_upgradebackup
}
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
# CHECK THE PATH
#=================================================
@ -35,7 +49,7 @@ path_url=$(ynh_normalize_url_path --path_url=$path_url)
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB"
#=================================================
# NGINX CONFIGURATION
@ -53,7 +67,7 @@ ynh_script_progression --message="Upgrading dependencies..."
ynh_install_app_dependencies $pkg_dependencies
# Install Webmin
ynh_backup_if_checksum_is_different "/etc/webmin/miniserv.conf"
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"
#=================================================
@ -76,14 +90,14 @@ ynh_store_file_checksum --file="/etc/webmin/miniserv.conf"
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --description "Webmin Daemon" --log "/var/log/$app/$app.log"
yunohost service add $app --description "Webmin Daemon"
#=================================================
# START SYSTEMD SERVICE
#=================================================
ynh_script_progression --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
ynh_systemd_action --service_name=$app --action="start" --line_match="Started LSB"
#=================================================
# SETUP SSOWAT