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

Merge branch 'master' into testing

This commit is contained in:
tituspijean 2021-05-05 21:45:50 +02:00 committed by GitHub
commit 2de7fa22e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 11 deletions

View file

@ -24,7 +24,7 @@
# 10.6.4~ynh3
#upgrade=1 from_commit=5478712c0ca7683503bc1b50cfafe81ea508065e
# 10.7.0~ynh1
#upgrade=1 from_commit=63ab03ab79cc088a52b8a36fb4fdf5918bf0e14b
upgrade=1 from_commit=63ab03ab79cc088a52b8a36fb4fdf5918bf0e14b
backup_restore=1
multi_instance=0
port_already_use=0

View file

@ -51,7 +51,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#=================================================
# SPECIFIC BACKUP
#=================================================
# BACKUP LOGROTATE
# BACKUP VARIOUS FILES
#=================================================
ynh_backup --src_path="/etc/logrotate.d/$app"

View file

@ -121,12 +121,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15
#=================================================
# RESTORE THE LOGROTATE CONFIGURATION
#=================================================
ynh_restore_file --origin_path="/etc/logrotate.d/$app"
#=================================================
# GENERIC FINALIZATION
#=================================================

View file

@ -63,10 +63,7 @@ if ! ynh_permission_exists --permission="admin"; then
# Create the required permissions
ynh_permission_create --permission="admin" --allowed=$admin
fi
<<<<<<< HEAD
=======
>>>>>>> Add jellyfin to render group
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================