diff --git a/manifest.toml b/manifest.toml index 0fcc113..a8b2bc9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -34,22 +34,6 @@ ram.runtime = "50M" type = "path" default = "/qbittorrent" - [install.admin] - type = "user" - - #[install.init_main_permission] - ## this is a generic question - ask strings are automatically handled by YunoHost's core - ## This won't be saved as setting and will instead be used to initialize the SSOwat permission - #type = "group" - #default = "admins" - - #[install.password] - ## this is a generic question - ask strings are automatically handled by YunoHost's core - ## Note that user-provided passwords questions are not automatically saved as setting - #help.en = "Use the help field to add an information for the admin about this question." - #help.fr = "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question." - #type = "password" - [resources] [resources.system_user] diff --git a/scripts/install b/scripts/install index bc6dc71..d57b5ce 100755 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ ynh_multimedia_addfolder --source_dir="$data_dir" --dest_dir="share/Torrents" ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action=start --line_match="Web UI: Now listening on IP: \*, port: $port" --log_path="$install_dir/.local/share/data/qBittorrent/logs/qbittorrent.log" --timeout=3600 +ynh_systemd_action --service_name=$app --action=start --line_match="Web UI: Now listening on IP: \*, port: $port" --log_path="$install_dir/.local/share/data/qBittorrent/logs/qbittorrent.log" --timeout=60 #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 20e79fb..120f133 100755 --- a/scripts/restore +++ b/scripts/restore @@ -44,7 +44,7 @@ yunohost service add $app --description="qBittorrent-nox service" --log="$instal ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 # Typically you only have either $app or php-fpm but not both at the same time... -ynh_systemd_action --service_name=$app --action=start --line_match="Web UI: Now listening on IP: \*, port: $port" --log_path="$install_dir/.local/share/data/qBittorrent/logs/qbittorrent.log" --timeout=3600 +ynh_systemd_action --service_name=$app --action=start --line_match="Web UI: Now listening on IP: \*, port: $port" --log_path="$install_dir/.local/share/data/qBittorrent/logs/qbittorrent.log" --timeout=60 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 9d92121..c13de44 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,7 +55,7 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1 #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action=start --line_match="Web UI: Now listening on IP: \*, port: $port" --log_path="$install_dir/.local/share/data/qBittorrent/logs/qbittorrent.log" --timeout=3600 +ynh_systemd_action --service_name=$app --action=start --line_match="Web UI: Now listening on IP: \*, port: $port" --log_path="$install_dir/.local/share/data/qBittorrent/logs/qbittorrent.log" --timeout=60 #================================================= # END OF SCRIPT