YunoHost-Apps/mumbleserver_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mumbleserver_ynh.git synced 2024-09-03 19:46:03 +02:00
Code Issues Activity Actions

mumble web: fix ports

Browse source 
make sure to use a dedicated port for web service, and to release it at removal
This commit is contained in:
Jibec 2020-04-10 14:11:36 +02:00
parent 6da29483ba
commit dd6e96a9cb
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/install
View file

@ -24,7 +24,7 @@ ynh_abort_if_errors
# Retrieve arguments # Retrieve arguments
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path=$YNH_APP_ARG_PATH path_url=$YNH_APP_ARG_PATH
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
welcometext=$YNH_APP_ARG_WELCOMETEXT welcometext=$YNH_APP_ARG_WELCOMETEXT
registerName=$YNH_APP_ARG_REGISTERNAME registerName=$YNH_APP_ARG_REGISTERNAME
@ -72,6 +72,8 @@ yunohost firewall allow Both "$port"
if [ "$mumbleweb" -eq 1 ] ; then if [ "$mumbleweb" -eq 1 ] ; then
port_web=$(ynh_find_port 64738) port_web=$(ynh_find_port 64738)
ynh_app_setting_set "$app" port_web "$port_web" ynh_app_setting_set "$app" port_web "$port_web"
# Open port in firewall
yunohost firewall allow Both "$port_web"
fi fi
#================================================= #=================================================
@ -158,6 +160,8 @@ fi
ynh_add_systemd_config ynh_add_systemd_config
if [ "$mumbleweb" -eq 1 ] ; then if [ "$mumbleweb" -eq 1 ] ; then
ynh_replace_string "__PORT__" "$port" "../conf/mumble-web.service"
ynh_replace_string "__PORT_WEB__" "$port_web" "../conf/mumble-web.service"
ynh_add_systemd_config "$app-web" mumble-web.service ynh_add_systemd_config "$app-web" mumble-web.service
fi fi

11
scripts/remove
View file

@ -18,8 +18,9 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get "$app" domain) domain=$(ynh_app_setting_get "$app" domain)
path=$(ynh_app_setting_get "$app" path) path=$(ynh_app_setting_get "$app" path)
port=$(ynh_app_setting_get "$app" port) port=$(ynh_app_setting_get "$app" port)
port_web=$(ynh_app_setting_get "$app" port_web)
mumbleweb=$(ynh_app_setting_get "$app" mumbleweb)
final_path=$(ynh_app_setting_get "$app" final_path) final_path=$(ynh_app_setting_get "$app" final_path)
#================================================= #=================================================
# STANDARD REMOVE # STANDARD REMOVE
#================================================= #=================================================
@ -78,6 +79,14 @@ then
yunohost firewall disallow Both "$port" > /dev/null 2>&1 yunohost firewall disallow Both "$port" > /dev/null 2>&1
fi fi
if [ "$mumbleweb" -eq 1 ] ; then
if yunohost firewall list | grep -q "\- $port_web$"
then
echo "Close port $port_web"
yunohost firewall disallow Both "$port_web" > /dev/null 2>&1
fi
fi
#================================================= #=================================================
# SPECIFIC REMOVE # SPECIFIC REMOVE
#================================================= #=================================================

2
scripts/upgrade
View file

@ -202,6 +202,8 @@ ynh_script_progression --message="Upgrading systemd configuration..." --time --w
ynh_add_systemd_config ynh_add_systemd_config
if [ "$mumbleweb" -eq 1 ] ; then if [ "$mumbleweb" -eq 1 ] ; then
ynh_replace_string "__PORT__" "$port" "../conf/mumble-web.service"
ynh_replace_string "__PORT_WEB__" "$port_web" "../conf/mumble-web.service"
ynh_add_systemd_config "$app-web" mumble-web.service ynh_add_systemd_config "$app-web" mumble-web.service
fi fi