1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/jenkins_ynh.git synced 2024-09-03 19:26:18 +02:00

Merge pull request #124 from YunoHost-Apps/bookworm

Fix Bookworm
This commit is contained in:
yalh76 2023-08-03 23:14:55 +02:00 committed by GitHub
commit ad703c9de8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 13 deletions

View file

@ -5,7 +5,7 @@
#=================================================
# dependencies used by the app
pkg_dependencies="openjdk-11-jdk daemon net-tools"
pkg_dependencies="openjdk-11-jdk|openjdk-17-jdk daemon net-tools"
PLUGIN_CLI_VERSION=2.9.3

View file

@ -34,7 +34,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
# STOP SYSTEMD SERVICE
#=================================================
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
#=================================================
# DECLARE DATA AND CONF FILES TO BACKUP
@ -59,7 +59,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
# START SYSTEMD SERVICE
#=================================================
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# END OF SCRIPT

View file

@ -72,7 +72,7 @@ fi
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
#=================================================
# MODIFY URL IN NGINX CONF
@ -121,7 +121,7 @@ systemctl daemon-reload --quiet
ynh_script_progression --message="Starting a systemd service..."
# Start a systemd service
ynh_systemd_action --service_name=$app --action="start" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="start" --line_match="Started" --log_path="systemd"
#=================================================
# RELOAD NGINX

View file

@ -141,7 +141,7 @@ ynh_replace_string --match_string="Environment=\"JENKINS_PORT=8080\"" --replace_
systemctl daemon-reload --quiet
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
if [[ $dpkg_install_failed -ge 1 ]]; then
dpkg --configure -a
@ -208,7 +208,7 @@ yunohost service add $app --description="Jenkins Continuous Integration Server"
ynh_script_progression --message="Starting a systemd service..."
# Start a systemd service
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# SETUP SSOWAT

View file

@ -37,7 +37,7 @@ fi
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
#=================================================
# REMOVE DEPENDENCIES

View file

@ -89,7 +89,7 @@ ynh_replace_string --match_string="Environment=\"JENKINS_PORT=8080\"" --replace_
systemctl daemon-reload --quiet
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# RESTORE THE APP MAIN DIR
@ -110,7 +110,7 @@ yunohost service add $app --description="Jenkins Continuous Integration Server"
#=================================================
ynh_script_progression --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# SEND A README FOR THE ADMIN

View file

@ -52,7 +52,7 @@ ynh_abort_if_errors
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped" --log_path="systemd"
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
@ -127,7 +127,7 @@ then
systemctl daemon-reload --quiet
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
fi
#=================================================
@ -186,7 +186,7 @@ yunohost service add $app --description="Jenkins Continuous Integration Server"
#=================================================
ynh_script_progression --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd"
ynh_systemd_action --service_name=$app --action="restart" --line_match="Started" --log_path="systemd"
#=================================================
# SEND A README FOR THE ADMIN