From 0f9aa86353c548c6f19b75823757a7e7f066264c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek@users.noreply.github.com>
Date: Sat, 12 Nov 2016 12:40:24 +0100
Subject: [PATCH 1/2] created nginx proxy conf for elasticsearch (#397)

* created nginx proxy conf for elasticsearch
* changed docu links to readthedoc.io in README.md
---
 README.md                        |  5 ++---
 contrib/nginx/elasticsearch.conf | 20 ++++++++++++++++++++
 contrib/nginx/zammad.conf        |  5 +++--
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 contrib/nginx/elasticsearch.conf

diff --git a/README.md b/README.md
index 268e29233..b0b0dad48 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@ You're going to love Zammad!
 
 ## Installing & Getting Started
 
-https://zammad.org/documentation
-
+http://zammad.readthedocs.io
 
 ## Screenshots
 
@@ -22,7 +21,7 @@ https://zammad.org/screenshots
 
 ## REST API
 
-https://zammad.org/documentation/api/intro
+http://zammad.readthedocs.io/en/latest/api-intro.html
 
 
 ## Contributing
diff --git a/contrib/nginx/elasticsearch.conf b/contrib/nginx/elasticsearch.conf
new file mode 100644
index 000000000..6305728b9
--- /dev/null
+++ b/contrib/nginx/elasticsearch.conf
@@ -0,0 +1,20 @@
+#
+# this is the nginx config for elasticsearch with authentication for remote login
+# you need to create the auth file /etc/nginx/.htpasswd-elasticsearch with you username and password
+# this can be done on the shell via: 'htpasswd -b -c /etc/nginx/.htpasswd-elasticsearch USERNAME PASSWORD'
+#
+
+upstream elasticsearch {
+    server 127.0.0.1:9200;
+}
+
+server {
+    listen 9200;
+
+    auth_basic "Elasticsearch";
+    auth_basic_user_file /etc/nginx/.htpasswd-elasticsearch;
+
+    location / {
+        proxy_pass http://elasticsearch;
+    }
+}
diff --git a/contrib/nginx/zammad.conf b/contrib/nginx/zammad.conf
index 82996d597..3dfc6d19e 100644
--- a/contrib/nginx/zammad.conf
+++ b/contrib/nginx/zammad.conf
@@ -12,9 +12,10 @@ upstream zammad-websocket {
 
 server {
     listen 80;
-    
+
+    # replace 'localhost' with your fqdn if you want to use zammad frome remote
     server_name localhost;
-    
+
     root /opt/zammad/public;
 
     access_log /var/log/nginx/zammad.access.log;

From cde79e02223f4ea8cff64a1a73140506bc4e5aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek@users.noreply.github.com>
Date: Sat, 12 Nov 2016 12:41:41 +0100
Subject: [PATCH 2/2] changed https to https

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b0b0dad48..4db84c6fa 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ You're going to love Zammad!
 
 ## Installing & Getting Started
 
-http://zammad.readthedocs.io
+https://zammad.readthedocs.io
 
 ## Screenshots
 
@@ -21,7 +21,7 @@ https://zammad.org/screenshots
 
 ## REST API
 
-http://zammad.readthedocs.io/en/latest/api-intro.html
+https://zammad.readthedocs.io/en/latest/api-intro.html
 
 
 ## Contributing