From 26cde22f598e3d50123d3f20ca96dbacf04c542a Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 29 May 2020 13:19:53 +0200
Subject: [PATCH] Fix ldap

---
 conf/ldap.exs   | 2 +-
 conf/nginx.conf | 1 +
 scripts/install | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/ldap.exs b/conf/ldap.exs
index 50e8f82..b7e3272 100644
--- a/conf/ldap.exs
+++ b/conf/ldap.exs
@@ -8,4 +8,4 @@ config :pleroma, :ldap,
   tls: false,
   # tlsopts: [],
   base: "ou=users,dc=yunohost,dc=org",
-  uid:  "cn"
\ No newline at end of file
+  uid:  "uid"
\ No newline at end of file
diff --git a/conf/nginx.conf b/conf/nginx.conf
index e1fb8e7..3c252af 100755
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -10,6 +10,7 @@
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
         proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_pass http://localhost:__PORT__;
 
diff --git a/scripts/install b/scripts/install
index 67479b7..a32a575 100755
--- a/scripts/install
+++ b/scripts/install
@@ -216,7 +216,7 @@ pushd $final_path/$app
     --db-configurable Y"
 popd
 
-cat "../conf/ldap.exs" "$config"
+cat "../conf/ldap.exs" >> "$config"
 
 pushd $final_path/$app