diff --git a/README.md b/README.md index 123c72d..4bf2e35 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Integrates seamlessly with Lidarr, Mylar3, Radarr, Readarr, and Sonarr offering complete management of your indexers with no per app Indexer setup required. +Complete management of your indexers for Radarr, Sonarr, Lidarr, ... **Shipped version:** 0.1.1.875~ynh1 diff --git a/README_fr.md b/README_fr.md index ceb9436..5266ad6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -S'intègre directement avec Lidarr, Mylar3, Radarr, Readarr, et Sonarr pour offrir une gestion complète de vos indexeurs sans aucune manipulation nécessaire dans chaque app. +Gestion complète de vos indexeurs pour Radarr, Sonarr, Lidarr, ... **Version incluse :** 0.1.1.875~ynh1 diff --git a/conf/systemd.service b/conf/systemd.service index a369a5c..9bd8a95 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -13,5 +13,35 @@ TimeoutStopSec=20 KillMode=process Restart=always +# Sandboxing options to harden security +# Depending on specificities of your service/app, you may need to tweak these +# .. but this should be a good baseline +# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html +NoNewPrivileges=yes +PrivateTmp=yes +PrivateDevices=yes +RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 +RestrictNamespaces=yes +RestrictRealtime=yes +DevicePolicy=closed +ProtectSystem=full +ProtectControlGroups=yes +ProtectKernelModules=yes +ProtectKernelTunables=yes +LockPersonality=yes +SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap + +# Denying access to capabilities that should not be relevant for webapps +# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html +CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD +CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE +CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT +CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK +CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM +CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG +CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE +CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW +CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG + [Install] WantedBy=multi-user.target diff --git a/manifest.json b/manifest.json index bcafcf4..f4b20d8 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "prowlarr", "packaging_format": 1, "description": { - "en": "Integrates seamlessly with Lidarr, Mylar3, Radarr, Readarr, and Sonarr offering complete management of your indexers with no per app Indexer setup required.", - "fr": "S'intègre directement avec Lidarr, Mylar3, Radarr, Readarr, et Sonarr pour offrir une gestion complète de vos indexeurs sans aucune manipulation nécessaire dans chaque app." + "en": "Complete management of your indexers for Radarr, Sonarr, Lidarr, ...", + "fr": "Gestion complète de vos indexeurs pour Radarr, Sonarr, Lidarr, ..." }, "version": "0.1.1.875~ynh1", "url": "https://prowlarr.com", @@ -40,8 +40,7 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" } ] } diff --git a/scripts/change_url b/scripts/change_url index c177364..35c55c5 100755 --- a/scripts/change_url +++ b/scripts/change_url @@ -88,8 +88,12 @@ then # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" + path="$new_path" # Create a dedicated NGINX config ynh_add_nginx_config +else + path_url="$old_path" + path="$old_path" fi # Change the domain for NGINX @@ -121,7 +125,7 @@ chown $app "$final_path/.data/config.xml" #================================================= ynh_script_progression --message="Starting a systemd service..." --time --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Starting Web Server" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Application started" #================================================= # RELOAD NGINX diff --git a/scripts/restore b/scripts/restore index 636a870..41ea82a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path "