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
Thomas Leymonerie
slapos
Commits
41533bd0
Commit
41533bd0
authored
Oct 24, 2012
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use haproxy even if schema is http
This is required for squid
parent
ec9fc998
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
software/erp5/instance-tidstorage.cfg.in
software/erp5/instance-tidstorage.cfg.in
+2
-1
software/erp5/software.cfg
software/erp5/software.cfg
+1
-1
No files found.
software/erp5/instance-tidstorage.cfg.in
View file @
41533bd0
...
@@ -543,6 +543,7 @@ recipe = slapos.cookbook:logrotate.d
...
@@ -543,6 +543,7 @@ recipe = slapos.cookbook:logrotate.d
name = apache-{{ backend_name }}
name = apache-{{ backend_name }}
log = ${apache-{{ backend_name }}:error-log} ${apache-{{ backend_name }}:access-log}
log = ${apache-{{ backend_name }}:error-log} ${apache-{{ backend_name }}:access-log}
post = {{ bin_directory }}/killpidfromfile ${apache-{{ backend_name }}:pid-file} SIGUSR1
post = {{ bin_directory }}/killpidfromfile ${apache-{{ backend_name }}:pid-file} SIGUSR1
{%- endif %}
[{{ section('haproxy-' ~ backend_name) }}]
[{{ section('haproxy-' ~ backend_name) }}]
recipe = slapos.cookbook:haproxy
recipe = slapos.cookbook:haproxy
...
@@ -556,7 +557,7 @@ wrapper-path = ${directory:services}/haproxy-{{ backend_name }}
...
@@ -556,7 +557,7 @@ wrapper-path = ${directory:services}/haproxy-{{ backend_name }}
binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
backend-list = {{ haproxy_backend_list | join(' ')}}
backend-list = {{ haproxy_backend_list | join(' ')}}
no-timeout = {{ no_timeout }}
no-timeout = {{ no_timeout }}
{%- endif %}
{% endfor -%}
{% endfor -%}
[{{ section('publish-apache-backend-list') }}]
[{{ section('publish-apache-backend-list') }}]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
...
...
software/erp5/software.cfg
View file @
41533bd0
...
@@ -120,7 +120,7 @@ extra-context =
...
@@ -120,7 +120,7 @@ extra-context =
[template-tidstorage]
[template-tidstorage]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
md5sum = d
dcbec5a02eb3ebcf474dec05bf81d5c
md5sum = d
a0fdf4d18943406061345a2639effd4
mode = 640
mode = 640
[template-cloudooo]
[template-cloudooo]
...
...
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