Merge branch 'develop' of github.com:martini/zammad into develop

# Conflicts:
#	contrib/nginx/zammad.conf

README.md

@@ -12,8 +12,7 @@ You're going to love Zammad!
 
 ## Installing & Getting Started
 
-https://zammad.org/documentation
-
+https://zammad.readthedocs.io
 
 ## Screenshots
 
@@ -22,7 +21,7 @@ https://zammad.org/screenshots
 
 ## REST API
 
-https://zammad.org/documentation/api/intro
+https://zammad.readthedocs.io/en/latest/api-intro.html
 
 
 ## Contributing

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;
+    }
+}

contrib/nginx/zammad.conf

@@ -13,6 +13,7 @@ upstream zammad-websocket {
 server {
     listen 80;
 
+    # replace 'localhost' with your fqdn if you want to use zammad from remote
     server_name localhost;
 
     root /opt/zammad/public;