1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/streama_ynh.git synced 2024-09-03 20:26:30 +02:00

Merge branch 'master' into testing

This commit is contained in:
ericgaspar 2020-12-14 11:00:22 +01:00
commit c107101ef2
No known key found for this signature in database
GPG key ID: 574F281483054D44
5 changed files with 9 additions and 6 deletions

View file

@ -19,7 +19,6 @@
upgrade=1
backup_restore=1
multi_instance=0
incorrect_path=0
port_already_use=0
change_url=0
;;; Options

View file

@ -6,7 +6,7 @@
"en": "Self hosted streaming media server",
"fr": "Serveur de streaming auto-hébergé"
},
"version": "1.9.2~ynh1",
"version": "1.9.2~ynh2",
"url": "https://streamaserver.org/",
"license": "MIT",
"maintainer": {
@ -38,6 +38,10 @@
"en": "Is it a public site?",
"fr": "Est-ce un site public ?"
},
"help": {
"en": "If enabled, Streama will be accessible by people who do not have an account. This can be changed later via the webadmin.",
"fr": "Si cette case est cochée, Streama sera accessible aux personnes nayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
},
"default": true
}
]

View file

@ -123,7 +123,7 @@ chmod +x $final_path/streama.jar
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..." --weight=4
ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
yunohost service add $app --description="Streama media system" --log="/var/log/$app/$app.log"

View file

@ -78,14 +78,14 @@ ynh_install_app_dependencies $pkg_dependencies
ynh_script_progression --message="Restoring the systemd configuration..." --weight=2
ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
systemctl enable $app.service --quiet
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
yunohost service add "$app" --description="Streama media system" --log="/var/log/$app/$app.log"
yunohost service add $app --description="Streama media system" --log="/var/log/$app/$app.log"
#=================================================
# START SYSTEMD SERVICE

View file

@ -58,7 +58,7 @@ ynh_setup_source --dest_dir="$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=20
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=24
# Create a dedicated NGINX config
ynh_add_nginx_config