Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos
Commits
45c53bfd
Commit
45c53bfd
authored
Mar 30, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: Minor optimisation to re-reduce size of the final file.
parent
b83701a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
software/apache-frontend/templates/apache-custom-slave-list.cfg.in
...apache-frontend/templates/apache-custom-slave-list.cfg.in
+9
-9
No files found.
software/apache-frontend/templates/apache-custom-slave-list.cfg.in
View file @
45c53bfd
...
@@ -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 }}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment