created nginx proxy conf for elasticsearch (#397)
* created nginx proxy conf for elasticsearch * changed docu links to readthedoc.io in README.md
This commit is contained in:
parent
715e6587d8
commit
0f9aa86353
3 changed files with 25 additions and 5 deletions
|
@ -12,8 +12,7 @@ You're going to love Zammad!
|
||||||
|
|
||||||
## Installing & Getting Started
|
## Installing & Getting Started
|
||||||
|
|
||||||
https://zammad.org/documentation
|
http://zammad.readthedocs.io
|
||||||
|
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
|
|
||||||
|
@ -22,7 +21,7 @@ https://zammad.org/screenshots
|
||||||
|
|
||||||
## REST API
|
## REST API
|
||||||
|
|
||||||
https://zammad.org/documentation/api/intro
|
http://zammad.readthedocs.io/en/latest/api-intro.html
|
||||||
|
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
20
contrib/nginx/elasticsearch.conf
Normal file
20
contrib/nginx/elasticsearch.conf
Normal file
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -13,6 +13,7 @@ upstream zammad-websocket {
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
|
|
||||||
|
# replace 'localhost' with your fqdn if you want to use zammad frome remote
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
|
|
||||||
root /opt/zammad/public;
|
root /opt/zammad/public;
|
||||||
|
|
Loading…
Reference in a new issue