From 320a7dcff9799490f239ca98944eec4d16ff1ff7 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 4 Jan 2022 19:01:36 +0100
Subject: [PATCH] remove username

---
 conf/config.yml | 4 ++--
 conf/nginx.conf | 5 -----
 manifest.json   | 2 +-
 scripts/restore | 3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/conf/config.yml b/conf/config.yml
index 633e08a..d2e8578 100644
--- a/conf/config.yml
+++ b/conf/config.yml
@@ -104,9 +104,9 @@ mailer:
   # SMTP Host port
   port: 25
   # SMTP username
-  username: "vikunja"
+  username: ""
   # SMTP password
-  password: "__SMTP_USER_PWD__"
+  password: ""
   # Wether to skip verification of the tls certificate on the server
   skiptlsverify: false
   # The default from address when sending emails
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 665ba1c..40c078f 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -2,11 +2,6 @@ location / {
 
   # Path to source
   alias __FINALPATH__/ ;
-  
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
 
   try_files $uri $uri/ /;
 
diff --git a/manifest.json b/manifest.json
index a236d12..cfd6598 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,7 +20,7 @@
         "name": "eric_G"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/restore b/scripts/restore
index 31d8909..507b857 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -35,8 +35,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2
 
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS