Merge branch 'bugfix/timeout-proxy-fpm-development-3266'

fixes #3266
2018-01-16 14:44:42 +01:00 · 2018-01-16 14:44:42 +01:00 · e381b1e439
parent 8599696d6d 38feeba5c3
commit e381b1e439
1 changed files with 3 additions and 0 deletions
--- a/.puppet/profiles/icingaweb2_dev/templates/icingaweb.conf.erb
+++ b/.puppet/profiles/icingaweb2_dev/templates/icingaweb.conf.erb
@ -44,3 +44,6 @@ Alias /<%= @web_path %> "/vagrant/public"
        ErrorDocument 404 /error_norewrite.html
    </IfModule>
 </Directory>
+
+
+ProxyTimeout 3600