Merge pull request #38 from YunoHost-Apps/testing

Testing

README.md

@@ -28,7 +28,7 @@ It aims to ease you perform your 2FA authentication steps whatever the device yo
 - Edit accounts, even the imported ones
 - Generate TOTP and HOTP security codes
 
-**Shipped version:** 4.1.0~ynh1
+**Shipped version:** 4.1.0~ynh2
 
 **Demo:** https://demo.2fauth.app/login
 

README_fr.md

@@ -28,7 +28,7 @@ It aims to ease you perform your 2FA authentication steps whatever the device yo
 - Edit accounts, even the imported ones
 - Generate TOTP and HOTP security codes
 
-**Version incluse :** 4.1.0~ynh1
+**Version incluse :** 4.1.0~ynh2
 
 **Démo :** https://demo.2fauth.app/login
 

conf/.env.example

@@ -111,8 +111,8 @@ AUTHENTICATION_GUARD=web-guard
 # Check your proxy documentation to find out how these headers are named (i.e 'REMOTE_USER', 'REMOTE_EMAIL', etc...)
 # (only relevant when AUTHENTICATION_GUARD is set to 'reverse-proxy-guard')
 
-AUTH_PROXY_HEADER_FOR_USER=
+AUTH_PROXY_HEADER_FOR_USER=null
-AUTH_PROXY_HEADER_FOR_EMAIL=
+AUTH_PROXY_HEADER_FOR_EMAIL=null
 
 # Custom logout URL to open when using an auth proxy.
 
@@ -123,12 +123,14 @@ PROXY_LOGOUT_URL=null
 
 # Relying Party name, aka the name of the application. If null, defaults to APP_NAME
 
-WEBAUTHN_NAME=
+WEBAUTHN_NAME=2FAuth
 
 # Relying Party ID. If null, the device will fill it internally.
 # See https://webauthn-doc.spomky-labs.com/pre-requisites/the-relying-party#how-to-determine-the-relying-party-id
 
-WEBAUTHN_ID=
+WEBAUTHN_ID=null
+# WEBAUTHN_ICON=null
+# [/DEPRECATED]
 
 # Optional image data in BASE64 (128 bytes maximum) or an image url
 # See https://webauthn-doc.spomky-labs.com/pre-requisites/the-relying-party#relying-party-icon
@@ -148,14 +150,14 @@ WEBAUTHN_ICON=
 #   'preferred' (default) : Will ask for user verification IF POSSIBLE
 #   'discouraged' : Will NOT ask for user verification (for example, to minimize disruption to the user interaction flow)
 
-WEBAUTHN_USER_VERIFICATION=
+WEBAUTHN_USER_VERIFICATION=preferred
 
 # Use this setting to declare trusted proxied.
 # Supported:
 #   '*': to trust any proxy
 #   A comma separated IP list: The list of proxies IP to trust
 
-TRUSTED_PROXIES=
+TRUSTED_PROXIES=null
 
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.

manifest.toml

@@ -5,7 +5,7 @@ name = "2FAuth"
 description.en = "self-hosted alternative to One Time Passcode"
 description.fr = "Alternative auto-hébergée a One Time Passcode"
 
-version = "4.1.0~ynh1"
+version = "4.1.0~ynh2"
 
 maintainers = ["eric_G"]
 
@@ -16,7 +16,7 @@ admindoc = "https://docs.2fauth.app/"
 code = "https://github.com/Bubka/2FAuth"
 
 [integration]
-yunohost = ">= 11.1.21"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
 ldap = false
@@ -28,7 +28,6 @@ ram.runtime = "50M"
 [install]
     [install.domain]
     type = "domain"
-    full_domain = true
 
     [install.admin]
     type = "user"

scripts/upgrade

@@ -47,7 +47,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=3
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --keep=".env storage"
+	ynh_setup_source --dest_dir="$install_dir" --keep="storage"
 fi
 
 chown -R $app:www-data "$install_dir"
@@ -63,6 +63,19 @@ ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+#=================================================
+# ADD A CONFIGURATION
+#=================================================
+ynh_script_progression --message="Adding a configuration file..." --weight=1
+
+email=$(ynh_user_get_info --username=$admin --key=mail)
+
+# Setup application config
+ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env"
+
+chmod 644 "$install_dir/.env"
+chown $app:$app "$install_dir/.env"
+
 #=================================================
 # INSTALL 2FAUTH WITH COMPOSER
 #=================================================