Merge pull request #11 from YunoHost-Apps/testing

Testing

README.md

@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Using WebRTC, FilePizza eliminates the initial upload step required by other web-based file sharing services. When senders initialize a transfer, they receive a "tempalink" they can distribute to recipients. Upon visiting this link, recipients' browsers connect directly to the sender’s browser and may begin downloading the selected file. Because data is never stored in an intermediary server, the transfer is fast, private, and secure.
 
-**Shipped version:** 1.1.0~ynh6
+**Shipped version:** 1.1.0~ynh7
 
 **Demo:** https://file.pizza/
 

README_fr.md

@@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Using WebRTC, FilePizza eliminates the initial upload step required by other web-based file sharing services. When senders initialize a transfer, they receive a "tempalink" they can distribute to recipients. Upon visiting this link, recipients' browsers connect directly to the sender’s browser and may begin downloading the selected file. Because data is never stored in an intermediary server, the transfer is fast, private, and secure.
 
-**Version incluse :** 1.1.0~ynh6
+**Version incluse :** 1.1.0~ynh7
 
 **Démo :** https://file.pizza/
 

conf/.env

@@ -1,3 +1,3 @@
 PORT=__PORT__
-EXTRA_ICE_SERVERS=turn:localhost:3478
-WEBTORRENT_TRACKERS=ws://localhost:8000
+EXTRA_ICE_SERVERS=turn:127.0.0.1:__PORT_TURN__
+WEBTORRENT_TRACKERS=ws://127.0.0.1:8000

manifest.toml

@@ -5,7 +5,7 @@ name = "FilePizza"
 description.en = "Peer-to-peer file transfers in your browser"
 description.fr = "Transferts de fichiers pair-à-pair dans votre navigateur"
 
-version = "1.1.0~ynh6"
+version = "1.1.0~ynh7"
 
 maintainers = ["eric_G"]
 
@@ -47,6 +47,7 @@ ram.runtime = "50M"
         autoupdate.strategy = "latest_github_commit"
 
     [resources.ports]
+    turn.default = 3478
     
     [resources.system_user]
 

scripts/install

@@ -21,7 +21,6 @@ ynh_install_nodejs --nodejs_version=$nodejs_version
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1
 
-# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
 chmod -R o-rwx "$install_dir"
@@ -32,11 +31,9 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..." --weight=4
 
-# 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="Peer-to-peer file transfers" --log="/var/log/$app/$app.log"
@@ -57,7 +54,6 @@ popd
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=6
 
-# Start a systemd service
 ynh_systemd_action --service_name=$app --action=restart --log_path="systemd"
 
 #=================================================

scripts/remove

@@ -15,20 +15,16 @@ source /usr/share/yunohost/helpers
 # REMOVE SERVICE INTEGRATION IN YUNOHOST
 #=================================================
 
-# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
 then
 	ynh_script_progression --message="Removing $app service integration..." --weight=2
 	yunohost service remove $app
 fi
 
-# Remove the dedicated systemd config
 ynh_remove_systemd_config
 
-# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-# Remove metapackage and its dependencies
 ynh_remove_nodejs
 
 #=================================================

scripts/restore

@@ -24,7 +24,6 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Reinstalling dependencies..." --weight=7
 
-# Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================

scripts/upgrade

@@ -32,7 +32,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
-	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$install_dir"
 fi
 
@@ -44,14 +43,11 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
 
-# Create a dedicated NGINX config
 ynh_add_nginx_config
 
-# Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
 env_path="$PATH"
-# Create a dedicated systemd config
 ynh_add_systemd_config
 
 yunohost service add $app --description="Peer-to-peer file transfers" --log="/var/log/$app/$app.log"