diff --git a/README.md b/README.md index 4ab716c..bd02ecd 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**Shipped version:** 3.4.23~ynh1 +**Shipped version:** 3.4.23~ynh2 **Demo:** https://send.vis.ee/ diff --git a/README_fr.md b/README_fr.md index 9f1db0a..cbbedbd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Un fork du Firefox Send de Mozilla. Mozilla a arrêté Send, et ce fork est un e Send est une expérience de partage de fichiers qui permet d'envoyer des fichiers chiffrés à d'autres utilisateurs. -**Version incluse :** 3.4.23~ynh1 +**Version incluse :** 3.4.23~ynh2 **Démo :** https://send.vis.ee/ diff --git a/conf/nginx.conf b/conf/nginx.conf index e5ae0c1..b7baa04 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,7 +12,7 @@ location /api/ws { proxy_pass http://127.0.0.1:__PORT__; proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; diff --git a/manifest.toml b/manifest.toml index fb77bfd..65b2f04 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Send" description.en = "File sharing which allows to send encrypted files" description.fr = "Partage de fichiers qui permet d'envoyer des fichiers chiffrés" -version = "3.4.23~ynh1" +version = "3.4.23~ynh2" maintainers = ["eric_G"] @@ -16,11 +16,14 @@ demo = "https://send.vis.ee/" code = "https://github.com/timvisee/send" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2" architectures = ["amd64", "arm64", "armhf"] multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "1G" ram.runtime = "50M" @@ -28,7 +31,6 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - full_domain = true [install.init_main_permission] help.en = "If enabled, Send will be accessible by people who do not have an account. This can be changed later via the webadmin." diff --git a/scripts/install b/scripts/install index 86d93e2..f830ed4 100644 --- a/scripts/install +++ b/scripts/install @@ -45,6 +45,22 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config +env_path="$PATH" +# Create a dedicated systemd config +ynh_add_systemd_config + +yunohost service add $app --description="Simple, private file sharing" --log="/var/log/$app/$app.log" + +#================================================= +# ADD A CONFIGURATION +#================================================= +ynh_script_progression --message="Adding a configuration file..." --weight=2 + +ynh_add_config --template="config.js" --destination="$install_dir/server/config.js" + +chmod 400 "$install_dir/server/config.js" +chown $app: "$install_dir/server/config.js" + #================================================= # SPECIFIC SETUP #================================================= @@ -58,32 +74,6 @@ pushd "$install_dir" ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm run build popd -#================================================= -# ADD A CONFIGURATION -#================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=2 - -ynh_add_config --template="../conf/config.js" --destination="$install_dir/server/config.js" - -chmod 400 "$install_dir/server/config.js" -chown $app: "$install_dir/server/config.js" - -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=1 - -env_path="$PATH" -# Create a dedicated systemd config -ynh_add_systemd_config - -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." - -yunohost service add $app --description="Simple, private file sharing" - #================================================= # START SYSTEMD SERVICE #================================================= diff --git a/scripts/remove b/scripts/remove index 1dba9eb..9846aba 100644 --- a/scripts/remove +++ b/scripts/remove @@ -22,42 +22,14 @@ then yunohost service remove $app fi -#================================================= -# STOP AND REMOVE SERVICE -#================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 - # Remove the dedicated systemd config ynh_remove_systemd_config -#================================================= -# REMOVE THE REDIS DATABASE -#================================================= -ynh_script_progression --message="Removing the Redis database..." --weight=1 - ynh_redis_remove_db "$redis_db" -#================================================= -# REMOVE APP MAIN DIR -#================================================= -ynh_script_progression --message="Removing $app main directory..." --weight=6 - -# Remove the app directory securely -#REMOVEME? ynh_secure_remove --file="$install_dir" - -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=5 - # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 - ynh_remove_nodejs #================================================= diff --git a/scripts/restore b/scripts/restore index bb548c9..49895c4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,27 +30,12 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=7 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE SYSTEMD -#================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --weight=5 - 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..." - -yunohost service add $app --description="Simple, private file sharing" +yunohost service add $app --description="Simple, private file sharing" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE @@ -59,13 +44,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -#================================================= -# GENERIC FINALIZATION -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 00c21be..b667c3d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -62,6 +62,22 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config +env_path="$PATH" +# Create a dedicated systemd config +ynh_add_systemd_config + +yunohost service add $app --description="Simple, private file sharing" --log="/var/log/$app/$app.log" + +#================================================= +# UPDATE A CONFIG FILE +#================================================= +ynh_script_progression --message="Updating a configuration file..." + +ynh_add_config --template="config.js" --destination="$install_dir/server/config.js" + +chmod 400 "$install_dir/server/config.js" +chown $app: "$install_dir/server/config.js" + #================================================= # SPECIFIC UPGRADE #================================================= @@ -79,34 +95,6 @@ then popd fi -#================================================= -# UPDATE A CONFIG FILE -#================================================= -ynh_script_progression --message="Updating a configuration file..." - -ynh_add_config --template="../conf/config.js" --destination="$install_dir/server/config.js" - -chmod 400 "$install_dir/server/config.js" -chown $app: "$install_dir/server/config.js" - -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --weight=2 - -env_path="$PATH" -# Create a dedicated systemd config -ynh_add_systemd_config - -#================================================= -# GENERIC FINALIZATION -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." - -yunohost service add $app --description="Simple, private file sharing" - #================================================= # START SYSTEMD SERVICE #=================================================