Few fixes

manifest.json

@@ -9,12 +9,12 @@
     "version": "4.7.0~ynh1",
     "url": "https://github.com/jesec/flood",
     "upstream": {
-        "license": "free",
+        "license": "GPL-3.0-or-later",
         "website": "https://github.com/jesec/flood",
         "admindoc": "https://github.com/jesec/flood/wiki",
         "code": "https://github.com/jesec/flood"
     },
-    "license": "free",
+    "license": "GPL-3.0-or-later",
     "maintainer": {
         "name": "Taker",
         "email": "me@taker.fr",

scripts/change_url

@@ -0,0 +1,136 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source _common.sh
+source /usr/share/yunohost/helpers
+
+#=================================================
+# RETRIEVE ARGUMENTS
+#=================================================
+
+old_domain=$YNH_APP_OLD_DOMAIN
+old_path=$YNH_APP_OLD_PATH
+
+new_domain=$YNH_APP_NEW_DOMAIN
+new_path=$YNH_APP_NEW_PATH
+
+app=$YNH_APP_INSTANCE_NAME
+
+#=================================================
+# LOAD SETTINGS
+#=================================================
+ynh_script_progression --message="Loading installation settings..."
+
+# Needed for helper "ynh_add_nginx_config"
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+
+# Add settings here as needed by your application
+port=$(ynh_app_setting_get --app=$app --key=port)
+scgi_port=$(ynh_app_setting_get --app=$app --key=scgi_port)
+rt_port=$(ynh_app_setting_get --app=$app --key=rt_port)
+
+#=================================================
+# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..."
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+	ynh_clean_check_starting
+	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
+	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
+
+	# Restore it if the upgrade fails
+	ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# CHECK WHICH PARTS SHOULD BE CHANGED
+#=================================================
+
+change_domain=0
+if [ "$old_domain" != "$new_domain" ]
+then
+	change_domain=1
+fi
+
+change_path=0
+if [ "$old_path" != "$new_path" ]
+then
+	change_path=1
+fi
+
+#=================================================
+# STANDARD MODIFICATIONS
+#=================================================
+# STOP SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Stopping a systemd service..."
+
+ynh_systemd_action --service_name=$app --action="stop"
+
+#=================================================
+# MODIFY URL IN NGINX CONF
+#=================================================
+ynh_script_progression --message="Updating NGINX web server configuration..."
+
+nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
+
+# Change the path in the NGINX config file
+if [ $change_path -eq 1 ]
+then
+	# Make a backup of the original NGINX config file if modified
+	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
+	# Set global variables for NGINX helper
+	domain="$old_domain"
+	path_url="$new_path"
+	# Create a dedicated NGINX config
+	ynh_add_nginx_config
+fi
+
+# Change the domain for NGINX
+if [ $change_domain -eq 1 ]
+then
+	# Delete file checksum for the old conf file location
+	ynh_delete_file_checksum --file="$nginx_conf_path"
+	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
+	# Store file checksum for the new config file location
+	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
+fi
+
+#=================================================
+# SPECIFIC MODIFICATIONS
+#=================================================
+# ...
+#=================================================
+
+#=================================================
+# GENERIC FINALISATION
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..."
+
+# Start a systemd service
+ynh_systemd_action --service_name=$app --action="start"
+
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading NGINX web server..."
+
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Change of URL completed for $app"

scripts/install

@@ -158,7 +158,7 @@ ynh_add_systemd_config --service=$app-rtorrent --template="rtorrent.service"
 ynh_script_progression --message="Integrating service in YunoHost..."
 
 yunohost service add $app
-yunohost service add $app-rtorrent
+yunohost service add $app-rtorrent --needs_exposed_ports $rt_port
 
 #=================================================
 # START SYSTEMD SERVICE

scripts/restore

@@ -107,7 +107,7 @@ systemctl enable $app-rtorrent.service --quiet
 ynh_script_progression --message="Integrating service in YunoHost..."
 
 yunohost service add $app
-yunohost service add $app-rtorrent
+yunohost service add $app-rtorrent --needs_exposed_ports $rt_port
 
 #=================================================
 # START SYSTEMD SERVICE

scripts/upgrade

@@ -19,6 +19,9 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+port=$(ynh_app_setting_get --app=$app --key=port)
+scgi_port=$(ynh_app_setting_get --app=$app --key=scgi_port)
+rt_port=$(ynh_app_setting_get --app=$app --key=rt_port)
 
 #=================================================
 # CHECK VERSION
@@ -118,7 +121,7 @@ ynh_add_systemd_config --service=$app-rtorrent --template="rtorrent.service"
 ynh_script_progression --message="Integrating service in YunoHost..."
 
 yunohost service add $app
-yunohost service add $app-rtorrent
+yunohost service add $app-rtorrent --needs_exposed_ports $rt_port
 
 #=================================================
 # START SYSTEMD SERVICE