Merge branch 'testing' into registration

conf/conduit.toml

@@ -42,3 +42,17 @@ trusted_servers = ["matrix.org"]
 
 address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy
 #address = "0.0.0.0" # If Conduit is running in a container, make sure the reverse proxy (ie. Traefik) can reach it.
+
+
+# Refer to your Coturn settings. 
+# `your.turn.url` has to match the REALM setting of your Coturn as well as `transport`.
+#turn_uris = ["turn:your.turn.url?transport=udp", "turn:your.turn.url?transport=tcp"]
+
+# static-auth-secret of your turnserver
+#turn_secret = "ADD SECRET HERE"
+
+# If you have your TURN server configured to use a username and password
+# you can provide these information too. In this case comment out `turn_secret above`!
+#turn_username = ""
+#turn_password = ""
+

manifest.toml

@@ -10,7 +10,7 @@ version = "0.6.0~ynh1"
 maintainers = [""]
 
 [upstream]
-license = "Apache"
+license = "Apache-2.0"
 website = "https://conduit.rs/"
 admindoc = "https://gitlab.com/famedly/conduit"
 code = "https://gitlab.com/famedly/conduit"

scripts/restore

@@ -17,7 +17,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chown -R $app:www-data "$install_dir"
+chown -R $app:root "$install_dir"
 
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS

scripts/upgrade

@@ -32,7 +32,7 @@ then
 	ynh_setup_source --dest_dir="$install_dir"
 fi
 
-chown -R $app:www-data "$install_dir"
+chown -R $app:root "$install_dir"
 chmod +x -R "$install_dir/conduit"
 
 #=================================================