From 45c53bfd8e280e4838055c067944c2c0ea3d4c4f Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Thu, 30 Mar 2017 13:32:36 +0200
Subject: [PATCH] apache-frontend: Minor optimisation to re-reduce size of the
final file.
---
.../templates/apache-custom-slave-list.cfg.in | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/software/apache-frontend/templates/apache-custom-slave-list.cfg.in b/software/apache-frontend/templates/apache-custom-slave-list.cfg.in
index b2d2acbea..1cf63e092 100644
--- a/software/apache-frontend/templates/apache-custom-slave-list.cfg.in
+++ b/software/apache-frontend/templates/apache-custom-slave-list.cfg.in
@@ -27,6 +27,13 @@ context =
{{ key }} = {{ value }}
{% endfor %}
+post = {{ apache_configuration.get('frontend-graceful-command') }}
+frequency = daily
+rotatep-num = 30
+sharedscripts = true
+notifempty = true
+create = true
+
[cadirectory]
recipe = slapos.cookbook:mkdirectory
requests = {{ custom_ssl_directory }}/requests/
@@ -108,12 +115,6 @@ recipe = slapos.cookbook:logrotate.d
name = ${:_buildout_section_name_}
log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}}
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 #}
[{{slave_ln_section}}]
@@ -316,9 +317,7 @@ extra-context =
raw apache_configuration_directory {{apache_configuration_directory}}
{# Publish information for the instance #}
-{% set publish_section_title = 'publish-apache-information' -%}
-{% do part_list.append(publish_section_title) -%}
-[{{ publish_section_title }}]
+[publish-apache-information]
recipe = slapos.cookbook:publish
public-ipv4 = {{ public_ipv4 }}
private-ipv4 = {{ local_ipv4 }}
@@ -333,6 +332,7 @@ parts +=
{% for part in part_list -%}
{{ ' %s' % part }}
{% endfor %}
+ publish-apache-information
apache-log-access
eggs-directory = {{ eggs_directory }}
--
2.30.9