Commit 45c53bfd authored by Rafael Monnerat's avatar Rafael Monnerat

apache-frontend: Minor optimisation to re-reduce size of the final file.

parent b83701a2
...@@ -27,6 +27,13 @@ context = ...@@ -27,6 +27,13 @@ context =
{{ key }} = {{ value }} {{ key }} = {{ value }}
{% endfor %} {% endfor %}
post = {{ apache_configuration.get('frontend-graceful-command') }}
frequency = daily
rotatep-num = 30
sharedscripts = true
notifempty = true
create = true
[cadirectory] [cadirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
requests = {{ custom_ssl_directory }}/requests/ requests = {{ custom_ssl_directory }}/requests/
...@@ -108,12 +115,6 @@ recipe = slapos.cookbook:logrotate.d ...@@ -108,12 +115,6 @@ recipe = slapos.cookbook:logrotate.d
name = ${:_buildout_section_name_} name = ${:_buildout_section_name_}
log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}} log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}}
backup = {{ slave_log_folder }} backup = {{ slave_log_folder }}
frequency = daily
rotatep-num = 30
post = {{ apache_configuration.get('frontend-graceful-command') }}
sharedscripts = true
notifempty = true
create = true
{# integrate current logs inside #} {# integrate current logs inside #}
[{{slave_ln_section}}] [{{slave_ln_section}}]
...@@ -316,9 +317,7 @@ extra-context = ...@@ -316,9 +317,7 @@ extra-context =
raw apache_configuration_directory {{apache_configuration_directory}} raw apache_configuration_directory {{apache_configuration_directory}}
{# Publish information for the instance #} {# Publish information for the instance #}
{% set publish_section_title = 'publish-apache-information' -%} [publish-apache-information]
{% do part_list.append(publish_section_title) -%}
[{{ publish_section_title }}]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
public-ipv4 = {{ public_ipv4 }} public-ipv4 = {{ public_ipv4 }}
private-ipv4 = {{ local_ipv4 }} private-ipv4 = {{ local_ipv4 }}
...@@ -333,6 +332,7 @@ parts += ...@@ -333,6 +332,7 @@ parts +=
{% for part in part_list -%} {% for part in part_list -%}
{{ ' %s' % part }} {{ ' %s' % part }}
{% endfor %} {% endfor %}
publish-apache-information
apache-log-access apache-log-access
eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
......
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