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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Roque
slapos
Commits
5fa2abf6
Commit
5fa2abf6
authored
Apr 13, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop using slap-network-information section.
parent
b0100a77
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
8 deletions
+16
-8
software/erp5/instance-tidstorage.cfg.in
software/erp5/instance-tidstorage.cfg.in
+12
-6
software/erp5/instance.cfg.in
software/erp5/instance.cfg.in
+2
-0
software/erp5/software.cfg
software/erp5/software.cfg
+2
-2
No files found.
software/erp5/instance-tidstorage.cfg.in
View file @
5fa2abf6
...
@@ -10,6 +10,12 @@ Note: all port counters are pre-incremented. No idea why base port is skipped.
...
@@ -10,6 +10,12 @@ Note: all port counters are pre-incremented. No idea why base port is skipped.
{% set json = json_module.loads(slapparameter_dict['json']) -%}
{% set json = json_module.loads(slapparameter_dict['json']) -%}
{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
{#
{#
XXX: This template only supports exactly one IPv4 and one IPv6 per
partition. No more (undefined result), no less (IndexError).
-#}
{% set ipv4 = (ipv4_set | list)[0] -%}
{% set ipv6 = (ipv6_set | list)[0] -%}
{#
BBB: erp5-ca['state'] has been configured as string by mistake. Keep this for
BBB: erp5-ca['state'] has been configured as string by mistake. Keep this for
backward compatibility with existing automatically setup CAs.
backward compatibility with existing automatically setup CAs.
-#}
-#}
...
@@ -251,7 +257,7 @@ bt5-repository-url = ${slap-parameter:bt5-repository-url}
...
@@ -251,7 +257,7 @@ bt5-repository-url = ${slap-parameter:bt5-repository-url}
#############################
#############################
[zeo-instance-entry-common]
[zeo-instance-entry-common]
recipe = slapos.cookbook:zeo
recipe = slapos.cookbook:zeo
ip =
${slap-network-information:local-ipv4
}
ip =
{{ ipv4 }
}
binary-path = {{ bin_directory }}/runzeo
binary-path = {{ bin_directory }}/runzeo
{% for zeo_id, zeo_configuration_list in json['zeo'].iteritems() -%}
{% for zeo_id, zeo_configuration_list in json['zeo'].iteritems() -%}
...
@@ -300,7 +306,7 @@ recipe = slapos.cookbook:generic.zope.zeo.client
...
@@ -300,7 +306,7 @@ recipe = slapos.cookbook:generic.zope.zeo.client
# availability in software's eggs
# availability in software's eggs
products = {{ parameter_dict['products'] }}
products = {{ parameter_dict['products'] }}
user = zope
user = zope
ip =
${slap-network-information:local-ipv4
}
ip =
{{ ipv4 }
}
deadlock-path = /manage_debug_threads
deadlock-path = /manage_debug_threads
timezone = {{ json['timezone'] }}
timezone = {{ json['timezone'] }}
zeo-connection-string =
zeo-connection-string =
...
@@ -369,7 +375,7 @@ site-id = {{ site_id }}
...
@@ -369,7 +375,7 @@ site-id = {{ site_id }}
[{{ section(section_name) }}]
[{{ section(section_name) }}]
recipe = slapos.cookbook:apache.zope.backend
recipe = slapos.cookbook:apache.zope.backend
backend = http://${haproxy-{{ backend_name }}:ip}:${haproxy-{{ backend_name }}:port}
backend = http://${haproxy-{{ backend_name }}:ip}:${haproxy-{{ backend_name }}:port}
ip =
${slap-network-information:global-ipv6
}
ip =
{{ ipv6 }
}
port = {{ current_apache_port }}
port = {{ current_apache_port }}
scheme = http
scheme = http
wrapper = ${basedirectory:services}/apache-public-{{ backend_name }}
wrapper = ${basedirectory:services}/apache-public-{{ backend_name }}
...
@@ -398,7 +404,7 @@ post = {{ bin_directory }}/killpidfromfile ${apache-public-{{ backend_name }}:pi
...
@@ -398,7 +404,7 @@ post = {{ bin_directory }}/killpidfromfile ${apache-public-{{ backend_name }}:pi
[{{ section(section_name) }}]
[{{ section(section_name) }}]
recipe = slapos.cookbook:apache.zope.backend
recipe = slapos.cookbook:apache.zope.backend
backend = http://${haproxy-{{ backend_name }}:ip}:${haproxy-{{ backend_name }}:port}
backend = http://${haproxy-{{ backend_name }}:ip}:${haproxy-{{ backend_name }}:port}
ip =
${slap-network-information:global-ipv6
}
ip =
{{ ipv6 }
}
port = {{ current_apache_port - 1 }}
port = {{ current_apache_port - 1 }}
wrapper = ${rootdirectory:bin}/apache-{{ backend_name }}
wrapper = ${rootdirectory:bin}/apache-{{ backend_name }}
scheme = https
scheme = https
...
@@ -437,7 +443,7 @@ post = {{ bin_directory }}/killpidfromfile ${apache-{{ backend_name }}:pid-file}
...
@@ -437,7 +443,7 @@ post = {{ bin_directory }}/killpidfromfile ${apache-{{ backend_name }}:pid-file}
recipe = slapos.cookbook:haproxy
recipe = slapos.cookbook:haproxy
name = {{ backend_name }}
name = {{ backend_name }}
conf-path = ${rootdirectory:etc}/haproxy-{{ backend_name }}.cfg
conf-path = ${rootdirectory:etc}/haproxy-{{ backend_name }}.cfg
ip =
${slap-network-information:local-ipv4
}
ip =
{{ ipv4 }
}
port = {{ current_haproxy_port }}
port = {{ current_haproxy_port }}
maxconn = {{ backend_configuration['maxconn'] }}
maxconn = {{ backend_configuration['maxconn'] }}
server-check-path = /{{ site_id }}/getId
server-check-path = /{{ site_id }}/getId
...
@@ -459,7 +465,7 @@ recipe = slapos.cookbook:tidstorage
...
@@ -459,7 +465,7 @@ recipe = slapos.cookbook:tidstorage
known-tid-storage-identifier-dict = {{ known_tid_storage_identifier_dict }}
known-tid-storage-identifier-dict = {{ known_tid_storage_identifier_dict }}
base-url = http://${zope-admin:ip}:${zope-admin:port}/%s/serialize
base-url = http://${zope-admin:ip}:${zope-admin:port}/%s/serialize
configuration-path = ${rootdirectory:etc}/tidstorage.py
configuration-path = ${rootdirectory:etc}/tidstorage.py
ip =
${slap-network-information:local-ipv4
}
ip =
{{ ipv4 }
}
port = 6001
port = 6001
timestamp-file-path = ${directory:tidstorage}/repozo_tidstorage_timestamp.log
timestamp-file-path = ${directory:tidstorage}/repozo_tidstorage_timestamp.log
logfile-name = ${basedirectory:log}/tidstorage.log
logfile-name = ${basedirectory:log}/tidstorage.log
...
...
software/erp5/instance.cfg.in
View file @
5fa2abf6
...
@@ -61,6 +61,8 @@ extra-context =
...
@@ -61,6 +61,8 @@ extra-context =
raw zeo_port_base 15000
raw zeo_port_base 15000
raw haproxy_port_base 11000
raw haproxy_port_base 11000
raw apache_port_base 10000
raw apache_port_base 10000
key ipv4_set slap-parameters:ipv4
key ipv6_set slap-parameters:ipv6
# Must match the key id in [switch-softwaretype] which uses this section.
# Must match the key id in [switch-softwaretype] which uses this section.
raw software_type tidstorage
raw software_type tidstorage
...
...
software/erp5/software.cfg
View file @
5fa2abf6
...
@@ -132,7 +132,7 @@ extra-context =
...
@@ -132,7 +132,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 =
eeea27e691d80c1dd605ad99cfbba3c3
md5sum =
520cf89a9b495a474519ac3402fed170
mode = 640
mode = 640
[template-cloudooo]
[template-cloudooo]
...
@@ -149,7 +149,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
...
@@ -149,7 +149,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
19a9d18674848128bb358eceff728a1d
md5sum =
f776aaa2c1b686841acf4c8b8192a782
extra-context =
extra-context =
key apache_location apache:location
key apache_location apache:location
key aspell_location aspell:location
key aspell_location aspell:location
...
...
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