Commit f19b241c authored by Nicolas Wavrant's avatar Nicolas Wavrant

monitor: improve httpd conf

log accesses (the logrotate conf already exists for them), and
remove the pattern "<IfDefine Port>" which was used when this
apache conf was extended by the software's apache extending
the monitor stack
parent 82bd7b9f
Pipeline #9159 failed with stage
in 0 seconds
...@@ -18,7 +18,7 @@ md5sum = 84bc2cf29e34b48c51116d93e2be7636 ...@@ -18,7 +18,7 @@ md5sum = 84bc2cf29e34b48c51116d93e2be7636
[monitor-httpd-conf] [monitor-httpd-conf]
_update_hash_filename_ = templates/monitor-httpd.conf.in _update_hash_filename_ = templates/monitor-httpd.conf.in
md5sum = b5f42503799e7e770afce4097d3b75ae md5sum = 0540fc5cc439a06079e9e724a5a55a70
[monitor-template-wrapper] [monitor-template-wrapper]
_update_hash_filename_ = templates/wrapper.in _update_hash_filename_ = templates/wrapper.in
......
...@@ -8,12 +8,13 @@ ThreadsPerChild 4 ...@@ -8,12 +8,13 @@ ThreadsPerChild 4
ServerName example.com ServerName example.com
ServerAdmin someone@email ServerAdmin someone@email
<IfDefine !MonitorPort>
Listen [{{ parameter_dict.get('listening-ip') }}]:{{ parameter_dict.get('port') }} Listen [{{ parameter_dict.get('listening-ip') }}]:{{ parameter_dict.get('port') }}
Define MonitorPort
</IfDefine>
DocumentRoot "{{ directory.get('private') }}" DocumentRoot "{{ directory.get('private') }}"
ErrorLog "{{ parameter_dict.get('error-log') }}" ErrorLog "{{ parameter_dict.get('error-log') }}"
LogFormat "%h %l %u %t \"%r\" %>s %b" common
CustomLog "{{ parameter_dict.get('access-log') }}" common
LoadModule log_config_module modules/mod_log_config.so
LoadModule unixd_module modules/mod_unixd.so LoadModule unixd_module modules/mod_unixd.so
LoadModule access_compat_module modules/mod_access_compat.so LoadModule access_compat_module modules/mod_access_compat.so
LoadModule authz_core_module modules/mod_authz_core.so LoadModule authz_core_module modules/mod_authz_core.so
......
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