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

Make sure discovery_service and discovery_client are set

This commit is contained in:
tituspijean 2021-06-08 00:53:49 +02:00
parent f7c8e849b4
commit 5f4b432aef
3 changed files with 35 additions and 27 deletions

View file

@ -72,30 +72,32 @@ ynh_script_progression --message="Finding an available port..." --weight=1
port=$(ynh_find_port --port=8095)
ynh_app_setting_set --app=$app --key=port --value=$port
discovery_service=$discovery
discovery_client=$discovery
if [ $discovery -eq 1 ]; then
ynh_script_progression --message="Configuring firewall..." --weight=1
ynh_script_progression --message="Configuring firewall..." --weight=1
# Open port 1900 for service auto-discovery
if ynh_port_available --port=$discovery_service_port; then
discovery_service=1
ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port
else
discovery_service=0
ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless."
fi
ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_service
# Open port 1900 for service auto-discovery
if ynh_port_available --port=$discovery_service_port; then
ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port
else
discovery_service=0
ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless."
fi
# Open port 7359 for client auto-discovery
if ynh_port_available --port=$discovery_client_port; then
discovery_client=1
ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port
else
discovery_client=0
ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless."
fi
ynh_app_setting_set --app=$app --key=discovery_client --value=$discovery_client
# Open port 7359 for client auto-discovery
if ynh_port_available --port=$discovery_client_port; then
ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port
else
discovery_client=0
ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless."
fi
fi
ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_service
ynh_app_setting_set --app=$app --key=discovery_client --value=$discovery_client
#=================================================
# INSTALL DEPENDENCIES
#=================================================

View file

@ -56,30 +56,32 @@ fi
# OPEN PORTS
#=================================================
discovery_service=$discovery
discovery_client=$discovery
if [ $discovery -eq 1 ]; then
ynh_script_progression --message="Configuring firewall..." --weight=1
# Open port 1900 for service auto-discovery
if ynh_port_available --port=$discovery_service_port; then
discovery_service=1
ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port
else
discovery_service=0
ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless."
fi
ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_service
# Open port 7359 for client auto-discovery
if ynh_port_available --port=$discovery_client_port; then
discovery_client=1
ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port
else
discovery_client=0
ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless."
fi
ynh_app_setting_set --app=$app --key=discovery_client --value=$discovery_client
fi
ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_service
ynh_app_setting_set --app=$app --key=discovery_client --value=$discovery_client
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================

View file

@ -21,6 +21,7 @@ admin=$(ynh_app_setting_get --app=$app --key=admin)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
config_path=$(ynh_app_setting_get --app=$app --key=config_path)
port=$(ynh_app_setting_get --app=$app --key=port)
discovery=$(ynh_app_setting_get --app=$app --key=discovery)
#=================================================
# CHECK VERSION
@ -91,30 +92,33 @@ ynh_abort_if_errors
# OPEN PORTS
#=================================================
discovery_service=$discovery
discovery_client=$discovery
if [ $discovery -eq 1 ]; then
ynh_script_progression --message="Configuring firewall..." --weight=1
# Open port 1900 for service auto-discovery
if ynh_port_available --port=$discovery_service_port; then
discovery_service=1
ynh_exec_warn_less yunohost firewall allow UDP $discovery_service_port
else
discovery_service=0
ynh_print_warn --message="Port $discovery_service_port (for service auto-discovery) is not available. Continuing nonetheless."
fi
ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_service
# Open port 7359 for client auto-discovery
if ynh_port_available --port=$discovery_client_port; then
discovery_client=1
ynh_exec_warn_less yunohost firewall allow UDP $discovery_client_port
else
discovery_client=0
ynh_print_warn --message="Port $discovery_client_port (for client auto-discovery) is not available. Continuing nonetheless."
fi
ynh_app_setting_set --app=$app --key=discovery_client --value=$discovery_client
fi
ynh_app_setting_set --app=$app --key=discovery_service --value=$discovery_service
ynh_app_setting_set --app=$app --key=discovery_client --value=$discovery_client
#=================================================
# STOP SYSTEMD SERVICE
#=================================================