diff options
| author | varac <varacanero@zeromail.org> | 2013-10-18 14:10:37 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-10-18 14:10:37 +0200 |
| commit | e142dcb4d4b3f51fa711cb3f4e4957d78110f039 (patch) | |
| tree | 0cad8f344236cf6e192a2957fb0d4e577da59dc2 /puppet/modules/site_apache | |
| parent | c884bc04e2eb29bdaacc5c6673ed7f212dc28e88 (diff) | |
| parent | 9074a7bce264d64f467bc628f06e37a5802043bd (diff) | |
Merge branch 'feature/3909_nagios__Resource_title_must_be' into develop
Diffstat (limited to 'puppet/modules/site_apache')
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb index 6059453b..afc19782 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb @@ -18,7 +18,7 @@ SSLCACertificatePath /etc/ssl/certs SSLCertificateChainFile <%= scope.lookupvar('x509::variables::local_CAs') %>/<%= scope.lookupvar('site_config::params::commercial_ca_name') %>.crt SSLCertificateKeyFile <%= scope.lookupvar('x509::variables::keys') %>/<%= scope.lookupvar('site_config::params::commercial_cert_name') %>.key - SSLCertificateFile <%= scope.lookupvar('x509::variables::certs') %>/<%= scope.lookupvar('site_config::params::commercial_cert_name') %>.crt + SSLCertificateFile <%= scope.lookupvar('x509::variables::certs') %>/<%= scope.lookupvar('site_config::params::commercial_cert_name') %>.crt RequestHeader set X_FORWARDED_PROTO 'https' @@ -49,6 +49,10 @@ <DirectoryMatch (/usr/share/nagios3/htdocs|/usr/lib/cgi-bin/nagios3|/etc/nagios3/stylesheets)> PassengerEnabled off AllowOverride all + # Nagios won't work with setting this option to "DENY", + # as set in conf.d/security (#4169). Therefor we allow + # it here, only for nagios. + Header set X-Frame-Options: "ALLOW" </DirectoryMatch> <% end -%> </VirtualHost> |