diff --git a/templates/apache_vhost.j2 b/templates/apache_vhost.j2 index cfa14ef..b7c97e8 100644 --- a/templates/apache_vhost.j2 +++ b/templates/apache_vhost.j2 @@ -43,11 +43,11 @@ SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA ## Custom fragment - SSLHonorCipherOrder on - Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains" - SSLProxyEngine On - SSLProxyCheckPeerCN on - SSLProxyCheckPeerExpire on + SSLHonorCipherOrder on + Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains" + SSLProxyEngine On + SSLProxyCheckPeerCN on + SSLProxyCheckPeerExpire on ScriptAlias /cgi-bin/nagios4 /usr/lib/cgi-bin/nagios4 ScriptAlias /nagios4/cgi-bin /usr/lib/cgi-bin/nagios4 @@ -63,64 +63,64 @@ DirectoryIndex index.php index.html AllowOverride None = 2.3> - - Require all granted - AuthName "Nagios Access" - AuthType Basic - AuthUserFile {{ auth_user_file }} - Require valid-user - - - - Order allow,deny - Allow from all + + Require all granted AuthName "Nagios Access" AuthType Basic AuthUserFile {{ auth_user_file }} Require valid-user + + + + Order allow,deny + Allow from all + AuthName "Nagios Access" + AuthType Basic + AuthUserFile {{ auth_user_file }} + Require valid-user - Options +ExecCGI + Options +ExecCGI - # PNP4Nagios - Alias /pnp4nagios "/usr/local/pnp4nagios/share" + # PNP4Nagios + Alias /pnp4nagios "/usr/local/pnp4nagios/share" - - AllowOverride None - Order allow,deny - Allow from all - # - # Use the same value as defined in nagios.conf - # - AuthName "Nagios Access" - AuthType Basic - AuthUserFile {{ auth_user_file }} - Require valid-user - - # Turn on URL rewriting - RewriteEngine On - Options +symLinksIfOwnerMatch - # Installation directory - RewriteBase /pnp4nagios/ - # Protect application and system files from being viewed - RewriteRule "^(?:application|modules|system)/" - [F] - # Allow any files or directories that exist to be displayed directly - RewriteCond "%{REQUEST_FILENAME}" !-f - RewriteCond "%{REQUEST_FILENAME}" !-d - # Rewrite all other URLs to index.php/URL - RewriteRule "^.*$" "index.php/$0" [PT] - - + + AllowOverride None + Order allow,deny + Allow from all + # + # Use the same value as defined in nagios.conf + # + AuthName "Nagios Access" + AuthType Basic + AuthUserFile {{ auth_user_file }} + Require valid-user + + # Turn on URL rewriting + RewriteEngine On + Options +symLinksIfOwnerMatch + # Installation directory + RewriteBase /pnp4nagios/ + # Protect application and system files from being viewed + RewriteRule "^(?:application|modules|system)/" - [F] + # Allow any files or directories that exist to be displayed directly + RewriteCond "%{REQUEST_FILENAME}" !-f + RewriteCond "%{REQUEST_FILENAME}" !-d + # Rewrite all other URLs to index.php/URL + RewriteRule "^.*$" "index.php/$0" [PT] + + - # HighCharts - Alias /highcharts "/usr/local/highcharts" - - Options None - AllowOverride None - Order allow,deny - Allow from all - + # HighCharts + Alias /highcharts "/usr/local/highcharts" + + Options None + AllowOverride None + Order allow,deny + Allow from all +