Skip to content

GitLab

P
puppet-icinga2_testing
Commit fd0237ae authored by Markus Frosch's avatar Markus Frosch 📣
Browse files
Options

icingaweb2: Fix apache template

parent 9a8663b0
Pipeline #810 failed with stage
    in 52 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 5 additions and 4 deletions
    templates/icingaweb2/apache2.conf.erb
    View file @ fd0237ae
    ...@@ -5,12 +5,14 @@ ...@@ -5,12 +5,14 @@
    # # # #
    ################################################################### ###################################################################
    Alias /icingaweb2 "<%= @web_root %>/public" Alias /icingaweb2 "/usr/share/icingaweb2/public"
    <Directory "<%= @web_root %>/public"> <Directory "/usr/share/icingaweb2/public">
    Options SymLinksIfOwnerMatch Options SymLinksIfOwnerMatch
    AllowOverride None AllowOverride None
    DirectoryIndex index.php
    <IfModule mod_authz_core.c> <IfModule mod_authz_core.c>
    # Apache 2.4 # Apache 2.4
    <RequireAll> <RequireAll>
    ...@@ -24,7 +26,7 @@ Alias /icingaweb2 "<%= @web_root %>/public" ...@@ -24,7 +26,7 @@ Alias /icingaweb2 "<%= @web_root %>/public"
    Allow from all Allow from all
    </IfModule> </IfModule>
    SetEnv ICINGAWEB_CONFIGDIR "<%= @config_dir %>" SetEnv ICINGAWEB_CONFIGDIR "/etc/icingaweb2"
    EnableSendfile Off EnableSendfile Off
    ...@@ -45,7 +47,6 @@ Alias /icingaweb2 "<%= @web_root %>/public" ...@@ -45,7 +47,6 @@ Alias /icingaweb2 "<%= @web_root %>/public"
    # forwarding PHP requests to FPM # forwarding PHP requests to FPM
    <%- if @_use_fpm -%> <%- if @_use_fpm -%>
    # forwarding PHP requests to FPM
    <FilesMatch "\.php$"> <FilesMatch "\.php$">
    SetHandler "proxy:fcgi://127.0.0.1:9000" SetHandler "proxy:fcgi://127.0.0.1:9000"
    ErrorDocument 503 /icingaweb2/error_unavailable.html ErrorDocument 503 /icingaweb2/error_unavailable.html
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment