Commit e805e127 authored by Nicolas Wavrant's avatar Nicolas Wavrant

stack-monitor: protection for including apache conf

parent b9628a50
...@@ -198,10 +198,11 @@ recipe = collective.recipe.template ...@@ -198,10 +198,11 @@ recipe = collective.recipe.template
input = inline: input = inline:
PidFile "$${:pid-file}" PidFile "$${:pid-file}"
ServerName example.com ServerName example.com
Listen [$${:listening-ip}]:$${:listening-port}
ServerAdmin someone@email ServerAdmin someone@email
StartServers 2 <IfDefine !MonitorPort>
ThreadsPerChild 1 Listen [$${:listening-ip}]:$${:listening-port}
Define MonitorPort
</IfDefine>
DocumentRoot "$${:document-root}" DocumentRoot "$${:document-root}"
ErrorLog "$${:error-log}" ErrorLog "$${:error-log}"
LoadModule unixd_module modules/mod_unixd.so LoadModule unixd_module modules/mod_unixd.so
...@@ -213,6 +214,8 @@ input = inline: ...@@ -213,6 +214,8 @@ input = inline:
LoadModule dir_module modules/mod_dir.so LoadModule dir_module modules/mod_dir.so
LoadModule ssl_module modules/mod_ssl.so LoadModule ssl_module modules/mod_ssl.so
# SSL Configuration # SSL Configuration
<IfDefine !SSLConfigured>
Define SSLConfigured
SSLCertificateFile $${ca-httpd:cert-file} SSLCertificateFile $${ca-httpd:cert-file}
SSLCertificateKeyFile $${ca-httpd:key-file} SSLCertificateKeyFile $${ca-httpd:key-file}
SSLRandomSeed startup builtin SSLRandomSeed startup builtin
...@@ -222,6 +225,7 @@ input = inline: ...@@ -222,6 +225,7 @@ input = inline:
SSLProtocol -ALL +SSLv3 +TLSv1 SSLProtocol -ALL +SSLv3 +TLSv1
SSLHonorCipherOrder On SSLHonorCipherOrder On
SSLCipherSuite RC4-SHA:HIGH:!ADH SSLCipherSuite RC4-SHA:HIGH:!ADH
</IfDefine>
SSLEngine On SSLEngine On
ScriptSock $${:cgid-pid-file} ScriptSock $${:cgid-pid-file}
<Directory $${:document-root}> <Directory $${:document-root}>
......
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