Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update Webserver configs (apache2 and nginx)

Browse source 
This fixes issue 2365 and simply changes config files to ipv4-connects to the Zammad-Backend.
This commit is contained in:
MrGeneration 2018-11-21 17:50:05 +01:00 committed by Martin Edenhofer
parent 2140134ebe
commit 26648e3752
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/apache2/zammad.conf
View file

@ -18,15 +18,15 @@
ProxyRequests Off ProxyRequests Off
ProxyPreserveHost On ProxyPreserveHost On
<Proxy localhost:3000> <Proxy 127.0.0.1:3000>
Require local Require local
</Proxy> </Proxy>
ProxyPass /assets ! ProxyPass /assets !
ProxyPass /favicon.ico ! ProxyPass /favicon.ico !
ProxyPass /robots.txt ! ProxyPass /robots.txt !
ProxyPass /ws ws://localhost:6042/ ProxyPass /ws ws://127.0.0.1:6042/
ProxyPass / http://localhost:3000/ ProxyPass / http://127.0.0.1:3000/
DocumentRoot "/opt/zammad/public" DocumentRoot "/opt/zammad/public"

10
contrib/apache2/zammad_ssl.conf
View file

@ -37,21 +37,21 @@
ProxyRequests Off ProxyRequests Off
ProxyPreserveHost On ProxyPreserveHost On
<Proxy localhost:3000> <Proxy 127.0.0.1:3000>
Require local Require local
</Proxy> </Proxy>
ProxyPass /assets ! ProxyPass /assets !
ProxyPass /favicon.ico ! ProxyPass /favicon.ico !
ProxyPass /robots.txt ! ProxyPass /robots.txt !
ProxyPass /ws ws://localhost:6042/ ProxyPass /ws ws://127.0.0.1:6042/
ProxyPass / http://localhost:3000/ ProxyPass / http://127.0.0.1:3000/
# Use settings below if proxying does not work and you receive HTTP-Errror 404 # Use settings below if proxying does not work and you receive HTTP-Errror 404
# if you use the settings below, make sure to comment out the above two options # if you use the settings below, make sure to comment out the above two options
# This may not apply to all systems, applies to openSuse # This may not apply to all systems, applies to openSuse
#ProxyPass /ws ws://localhost:6042/ "retry=1 acque=3000 timeout=600 keepalive=On" #ProxyPass /ws ws://127.0.0.1:6042/ "retry=1 acque=3000 timeout=600 keepalive=On"
#ProxyPass / http://localhost:3000/ "retry=1 acque=3000 timeout=600 keepalive=On" #ProxyPass / http://127.0.0.1:3000/ "retry=1 acque=3000 timeout=600 keepalive=On"
DocumentRoot "/opt/zammad/public" DocumentRoot "/opt/zammad/public"

4
contrib/nginx/zammad.conf
View file

@ -3,11 +3,11 @@
# #
upstream zammad-railsserver { upstream zammad-railsserver {
server localhost:3000; server 127.0.0.1:3000;
} }
upstream zammad-websocket { upstream zammad-websocket {
server localhost:6042; server 127.0.0.1:6042;
} }
server { server {

4
contrib/nginx/zammad_ssl.conf
View file

@ -9,11 +9,11 @@
# #
upstream zammad-railsserver { upstream zammad-railsserver {
server localhost:3000; server 127.0.0.1:3000;
} }
upstream zammad-websocket { upstream zammad-websocket {
server localhost:6042; server 127.0.0.1:6042;
} }
server { server {