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
Titouan Soulard
slapos
Commits
2b9655bb
Commit
2b9655bb
authored
Oct 15, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*: use new option name for shared requests
parent
a5adb95c
Changes
53
Show whitespace changes
Inline
Side-by-side
Showing
53 changed files
with
67 additions
and
67 deletions
+67
-67
software/beremiz-ide/buildout.hash.cfg
software/beremiz-ide/buildout.hash.cfg
+1
-1
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
+1
-1
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/instance-frontend.cfg.in
software/caddy-frontend/instance-frontend.cfg.in
+2
-2
software/dufs/buildout.hash.cfg
software/dufs/buildout.hash.cfg
+1
-1
software/dufs/instance.cfg.in
software/dufs/instance.cfg.in
+1
-1
software/erp5testnode/buildout.hash.cfg
software/erp5testnode/buildout.hash.cfg
+1
-1
software/erp5testnode/instance-default.cfg.jinja.in
software/erp5testnode/instance-default.cfg.jinja.in
+1
-1
software/grafana/buildout.hash.cfg
software/grafana/buildout.hash.cfg
+1
-1
software/grafana/instance.cfg.in
software/grafana/instance.cfg.in
+1
-1
software/headless-chromium/buildout.hash.cfg
software/headless-chromium/buildout.hash.cfg
+1
-1
software/headless-chromium/instance-headless-chromium.cfg.in
software/headless-chromium/instance-headless-chromium.cfg.in
+1
-1
software/html5as/buildout.hash.cfg
software/html5as/buildout.hash.cfg
+1
-1
software/html5as/instance_html5as.cfg.in
software/html5as/instance_html5as.cfg.in
+1
-1
software/hugo/buildout.hash.cfg
software/hugo/buildout.hash.cfg
+1
-1
software/hugo/instance.cfg.in
software/hugo/instance.cfg.in
+2
-2
software/jscrawler/buildout.hash.cfg
software/jscrawler/buildout.hash.cfg
+1
-1
software/jscrawler/instance-jscrawler.cfg.jinja2.in
software/jscrawler/instance-jscrawler.cfg.jinja2.in
+1
-1
software/jupyter/buildout.hash.cfg
software/jupyter/buildout.hash.cfg
+1
-1
software/jupyter/instance-jupyter.cfg.in
software/jupyter/instance-jupyter.cfg.in
+1
-1
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+2
-2
software/kvm/instance-kvm-cluster.cfg.jinja2.in
software/kvm/instance-kvm-cluster.cfg.jinja2.in
+1
-1
software/kvm/instance-kvm.cfg.jinja2
software/kvm/instance-kvm.cfg.jinja2
+1
-1
software/repman/buildout.hash.cfg
software/repman/buildout.hash.cfg
+1
-1
software/repman/instance-repman.cfg.jinja2.in
software/repman/instance-repman.cfg.jinja2.in
+1
-1
software/restic-rest-server/buildout.hash.cfg
software/restic-rest-server/buildout.hash.cfg
+1
-1
software/restic-rest-server/instance.cfg.in
software/restic-rest-server/instance.cfg.in
+1
-1
software/slapos-master/buildout.hash.cfg
software/slapos-master/buildout.hash.cfg
+1
-1
software/slapos-master/instance-erp5.cfg.in
software/slapos-master/instance-erp5.cfg.in
+1
-1
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+3
-3
software/theia/buildout.hash.cfg
software/theia/buildout.hash.cfg
+1
-1
software/theia/instance-theia.cfg.jinja.in
software/theia/instance-theia.cfg.jinja.in
+1
-1
software/unstable/ajaxplorer/buildout.hash.cfg
software/unstable/ajaxplorer/buildout.hash.cfg
+1
-1
software/unstable/ajaxplorer/instance-apachephp.cfg
software/unstable/ajaxplorer/instance-apachephp.cfg
+3
-3
software/unstable/cdn-me/instance-cdn-request.cfg.jinja2
software/unstable/cdn-me/instance-cdn-request.cfg.jinja2
+4
-4
software/unstable/davstorage/buildout.hash.cfg
software/unstable/davstorage/buildout.hash.cfg
+1
-1
software/unstable/davstorage/instance-davstorage.cfg
software/unstable/davstorage/instance-davstorage.cfg
+2
-2
software/unstable/etherpad-lite/buildout.hash.cfg
software/unstable/etherpad-lite/buildout.hash.cfg
+1
-1
software/unstable/etherpad-lite/instance-etherpad-lite.cfg
software/unstable/etherpad-lite/instance-etherpad-lite.cfg
+1
-1
software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in
...table/hexaglobe-watermarking/instance-watermarking.cfg.in
+1
-1
software/unstable/lamp-generic/instance-apache-php.cfg.in
software/unstable/lamp-generic/instance-apache-php.cfg.in
+1
-1
software/unstable/trac-svn/instance-trac.cfg
software/unstable/trac-svn/instance-trac.cfg
+1
-1
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+1
-1
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+1
-1
stack/lamp/buildout.hash.cfg
stack/lamp/buildout.hash.cfg
+1
-1
stack/lamp/instance-lamp.cfg.jinja2.in
stack/lamp/instance-lamp.cfg.jinja2.in
+1
-1
stack/monitor/buildout.hash.cfg
stack/monitor/buildout.hash.cfg
+1
-1
stack/monitor/instance-monitor.cfg.jinja2.in
stack/monitor/instance-monitor.cfg.jinja2.in
+1
-1
stack/resilient/buildout.hash.cfg
stack/resilient/buildout.hash.cfg
+1
-1
stack/resilient/template-replicated.cfg.in
stack/resilient/template-replicated.cfg.in
+4
-4
stack/unstable/boinc/instance-boinc.cfg
stack/unstable/boinc/instance-boinc.cfg
+1
-1
stack/unstable/lapp/apache/instance-apache-php.cfg.in
stack/unstable/lapp/apache/instance-apache-php.cfg.in
+1
-1
No files found.
software/beremiz-ide/buildout.hash.cfg
View file @
2b9655bb
...
@@ -19,7 +19,7 @@ md5sum = db7fe97f4c6b84cfadb7b5c68eab517a
...
@@ -19,7 +19,7 @@ md5sum = db7fe97f4c6b84cfadb7b5c68eab517a
[template-instance-beremiz]
[template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in
filename = instance-beremiz.cfg.jinja2.in
md5sum =
c92317d0d754f62d3259136d1a0df1ac
md5sum =
9d59c9392636ab71f37b43fd8008fd10
[template-instance-beremiz-test]
[template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in
filename = instance-beremiz-test.cfg.jinja2.in
...
...
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
View file @
2b9655bb
...
@@ -213,7 +213,7 @@ output = ${directory:bin}/xterm
...
@@ -213,7 +213,7 @@ output = ${directory:bin}/xterm
[request-vnc-frontend]
[request-vnc-frontend]
<= slap-connection
<= slap-connection
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
s
lave
= true
s
hared
= true
config-https-only = True
config-https-only = True
config-type = websocket
config-type = websocket
config-url = https://[${novnc-instance:ip}]:${novnc-instance:port}
config-url = https://[${novnc-instance:ip}]:${novnc-instance:port}
...
...
software/caddy-frontend/buildout.hash.cfg
View file @
2b9655bb
...
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
...
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-frontend]
[profile-frontend]
filename = instance-frontend.cfg.in
filename = instance-frontend.cfg.in
md5sum =
0ec59d2fb5617e82d1848c1170772d84
md5sum =
ae04e2c6137cb5bd5ef1a9b3c6738c49
[profile-master]
[profile-master]
filename = instance-master.cfg.in
filename = instance-master.cfg.in
...
...
software/caddy-frontend/instance-frontend.cfg.in
View file @
2b9655bb
...
@@ -969,7 +969,7 @@ extra-context =
...
@@ -969,7 +969,7 @@ extra-context =
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
name = Slave Introspection Frontend {{ instance_parameter_dict['configuration.frontend-name'] }}
name = Slave Introspection Frontend {{ instance_parameter_dict['configuration.frontend-name'] }}
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.slave-introspection-https-port'] }}/
config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.slave-introspection-https-port'] }}/
config-https-only = true
config-https-only = true
return = domain secure_access
return = domain secure_access
...
@@ -979,7 +979,7 @@ return = domain secure_access
...
@@ -979,7 +979,7 @@ return = domain secure_access
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
name = Backend Haproxy Statistic Frontend {{ instance_parameter_dict['configuration.frontend-name'] }}
name = Backend Haproxy Statistic Frontend {{ instance_parameter_dict['configuration.frontend-name'] }}
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.backend-haproxy-statistic-port'] }}/
config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.backend-haproxy-statistic-port'] }}/
config-https-only = true
config-https-only = true
return = domain secure_access
return = domain secure_access
...
...
software/dufs/buildout.hash.cfg
View file @
2b9655bb
...
@@ -15,4 +15,4 @@
...
@@ -15,4 +15,4 @@
[instance.cfg.in]
[instance.cfg.in]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
9553d3f24d4201d3320408d8a3154049
md5sum =
0cb3cbac5479581985e5446078217686
software/dufs/instance.cfg.in
View file @
2b9655bb
...
@@ -165,7 +165,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -165,7 +165,7 @@ recipe = slapos.cookbook:requestoptional
name = dufs Server Frontend
name = dufs Server Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = ${dufs-server:url}
config-url = ${dufs-server:url}
return = domain secure_access
return = domain secure_access
...
...
software/erp5testnode/buildout.hash.cfg
View file @
2b9655bb
...
@@ -18,4 +18,4 @@ md5sum = 5bd72da73a8b84f70f568686924d7d6c
...
@@ -18,4 +18,4 @@ md5sum = 5bd72da73a8b84f70f568686924d7d6c
[template-default]
[template-default]
filename = instance-default.cfg.jinja.in
filename = instance-default.cfg.jinja.in
md5sum =
0c9ea9fa7417885889a536ec2cf2093f
md5sum =
2aafd7708aac85847da3a8679b84fe34
software/erp5testnode/instance-default.cfg.jinja.in
View file @
2b9655bb
...
@@ -236,7 +236,7 @@ output = $${directory:srv}/exporter.exclude
...
@@ -236,7 +236,7 @@ output = $${directory:srv}/exporter.exclude
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-https-only = true
config-https-only = true
return = domain secure_access
return = domain secure_access
...
...
software/grafana/buildout.hash.cfg
View file @
2b9655bb
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[instance-profile]
[instance-profile]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
6fb42f5663864789ff7b375a9a86888e
md5sum =
94674d597e3ea7e9eca3637a737765ff
[influxdb-config-file]
[influxdb-config-file]
filename = influxdb-config-file.cfg.in
filename = influxdb-config-file.cfg.in
...
...
software/grafana/instance.cfg.in
View file @
2b9655bb
...
@@ -263,7 +263,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -263,7 +263,7 @@ recipe = slapos.cookbook:requestoptional
name = Grafana Frontend
name = Grafana Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = ${grafana:url}
config-url = ${grafana:url}
config-https-only = true
config-https-only = true
return = domain secure_access
return = domain secure_access
...
...
software/headless-chromium/buildout.hash.cfg
View file @
2b9655bb
...
@@ -4,7 +4,7 @@ md5sum = 6315598b2c7c19f9e2d9cdf090492e2c
...
@@ -4,7 +4,7 @@ md5sum = 6315598b2c7c19f9e2d9cdf090492e2c
[instance-headless-chromium]
[instance-headless-chromium]
_update_hash_filename_ = instance-headless-chromium.cfg.in
_update_hash_filename_ = instance-headless-chromium.cfg.in
md5sum =
a350b7b5ac03971f1b8d66949905c164
md5sum =
feaef60353c94e02d38cfec66f0eb861
[template-nginx-conf]
[template-nginx-conf]
_update_hash_filename_ = templates/nginx.conf.in
_update_hash_filename_ = templates/nginx.conf.in
...
...
software/headless-chromium/instance-headless-chromium.cfg.in
View file @
2b9655bb
...
@@ -153,7 +153,7 @@ password = ${frontend-instance-password:passwd}
...
@@ -153,7 +153,7 @@ password = ${frontend-instance-password:passwd}
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
name = Headless Chromium Remote Debugging Frontend
name = Headless Chromium Remote Debugging Frontend
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = https://${headless-chromium:proxy-address}
config-url = https://${headless-chromium:proxy-address}
config-https-only = true
config-https-only = true
config-type = websocket
config-type = websocket
...
...
software/html5as/buildout.hash.cfg
View file @
2b9655bb
...
@@ -21,7 +21,7 @@ md5sum = 23c15a579b66cef866b30a2f53b1b737
...
@@ -21,7 +21,7 @@ md5sum = 23c15a579b66cef866b30a2f53b1b737
[instance_html5as]
[instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in
_update_hash_filename_ = instance_html5as.cfg.in
md5sum =
fc1dd9faf99a4f75e3727b80bb2d59fb
md5sum =
0b16e9a2cac16668e100687f19430b1e
[template_nginx_conf]
[template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in
_update_hash_filename_ = templates/nginx_conf.in
...
...
software/html5as/instance_html5as.cfg.in
View file @
2b9655bb
...
@@ -221,7 +221,7 @@ name = HTML5AS frontend
...
@@ -221,7 +221,7 @@ name = HTML5AS frontend
# Specify the software url of the frontend software release
# Specify the software url of the frontend software release
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
# It is not a dedicated instance but an instance allocated on a shared instance
# It is not a dedicated instance but an instance allocated on a shared instance
s
lave
= true
s
hared
= true
config-url = ${html5as:access_url}
config-url = ${html5as:access_url}
config-https-only = true
config-https-only = true
# The parameter expected to be received from the request are listed here.
# The parameter expected to be received from the request are listed here.
...
...
software/hugo/buildout.hash.cfg
View file @
2b9655bb
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[template-cfg]
[template-cfg]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
34f7ab6fe20f685d7d03f2e36f3be207
md5sum =
edddaa4f6145f3eab4463063dacacfaa
[template_nginx_conf]
[template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in
_update_hash_filename_ = templates/nginx_conf.in
...
...
software/hugo/instance.cfg.in
View file @
2b9655bb
...
@@ -137,7 +137,7 @@ monitor-httpd-port = ${slap-configuration:configuration.hugo-monitor-httpd-port}
...
@@ -137,7 +137,7 @@ monitor-httpd-port = ${slap-configuration:configuration.hugo-monitor-httpd-port}
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
name = Hugo frontend
name = Hugo frontend
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = ${hugo:hugo-access-url}
config-url = ${hugo:hugo-access-url}
config-https-only = true
config-https-only = true
return = domain secure_access
return = domain secure_access
...
@@ -229,7 +229,7 @@ post = kill -USR1 $(cat ${hugo:path-pid})
...
@@ -229,7 +229,7 @@ post = kill -USR1 $(cat ${hugo:path-pid})
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
name = Hugo Nginx frontend
name = Hugo Nginx frontend
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = ${hugo:nginx-access-url}
config-url = ${hugo:nginx-access-url}
config-https-only = true
config-https-only = true
return = domain secure_access
return = domain secure_access
...
...
software/jscrawler/buildout.hash.cfg
View file @
2b9655bb
...
@@ -19,7 +19,7 @@ md5sum = 7333d1dfd4e8e4c375f7f1748292f554
...
@@ -19,7 +19,7 @@ md5sum = 7333d1dfd4e8e4c375f7f1748292f554
[template-jscrawler]
[template-jscrawler]
filename = instance-jscrawler.cfg.jinja2.in
filename = instance-jscrawler.cfg.jinja2.in
md5sum =
ae9269ab5b1cce77016f822024d2d996
md5sum =
2ba9d6a30b420c9bf67d4a135b48212b
[template-jscrawler-builder]
[template-jscrawler-builder]
filename = template-jscrawler.builder.sh.in
filename = template-jscrawler.builder.sh.in
...
...
software/jscrawler/instance-jscrawler.cfg.jinja2.in
View file @
2b9655bb
...
@@ -41,7 +41,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -41,7 +41,7 @@ recipe = slapos.cookbook:requestoptional
name = jscawler Frontend
name = jscawler Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = https://[${httpd-wrapper:host}]:${httpd-wrapper:port}
config-url = https://[${httpd-wrapper:host}]:${httpd-wrapper:port}
return = secure_access domain
return = secure_access domain
...
...
software/jupyter/buildout.hash.cfg
View file @
2b9655bb
...
@@ -19,7 +19,7 @@ md5sum = 5f39952f94095b1f12f41db76867e71e
...
@@ -19,7 +19,7 @@ md5sum = 5f39952f94095b1f12f41db76867e71e
[instance-jupyter]
[instance-jupyter]
filename = instance-jupyter.cfg.in
filename = instance-jupyter.cfg.in
md5sum =
ee2fbb01b4143c19fa16f8449ca4ec29
md5sum =
1ac942c544d2a2aa3d1e16a61a1f8bc8
[jupyter-notebook-config]
[jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja
filename = jupyter_notebook_config.py.jinja
...
...
software/jupyter/instance-jupyter.cfg.in
View file @
2b9655bb
...
@@ -127,7 +127,7 @@ key-file = ${slap-connection:key-file}
...
@@ -127,7 +127,7 @@ key-file = ${slap-connection:key-file}
cert-file = ${slap-connection:cert-file}
cert-file = ${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id}
computer-id = ${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id}
partition-id = ${slap-connection:partition-id}
s
lave
= true
s
hared
= true
config-type = notebook
config-type = notebook
config-url = https://[${instance-parameter:host}]:${instance-parameter:port}
config-url = https://[${instance-parameter:host}]:${instance-parameter:port}
return = secure_access
return = secure_access
...
...
software/kvm/buildout.hash.cfg
View file @
2b9655bb
...
@@ -19,11 +19,11 @@ md5sum = a7978940fb9cdcc4e1ec33015ba640ba
...
@@ -19,11 +19,11 @@ md5sum = a7978940fb9cdcc4e1ec33015ba640ba
[template-kvm]
[template-kvm]
filename = instance-kvm.cfg.jinja2
filename = instance-kvm.cfg.jinja2
md5sum =
d790827b6199aa5aada5fe7acb8f1a7b
md5sum =
69749ef4be49b970af9548d68e6d8785
[template-kvm-cluster]
[template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in
filename = instance-kvm-cluster.cfg.jinja2.in
md5sum =
4919254d85b98659c1be2ae631b99a13
md5sum =
15415f63741dc8c478512f9e410bb0ae
[template-kvm-resilient]
[template-kvm-resilient]
filename = instance-kvm-resilient.cfg.jinja2
filename = instance-kvm-resilient.cfg.jinja2
...
...
software/kvm/instance-kvm-cluster.cfg.jinja2.in
View file @
2b9655bb
...
@@ -219,7 +219,7 @@ recipe = slapos.cookbook:request
...
@@ -219,7 +219,7 @@ recipe = slapos.cookbook:request
software-url = {{ slave_frontend_sr }}
software-url = {{ slave_frontend_sr }}
name = Frontend {{ name }}
name = Frontend {{ name }}
software-type = {{ slave_frontend_stype }}
software-type = {{ slave_frontend_stype }}
s
lave
= true
s
hared
= true
config-url = {{ url }}
config-url = {{ url }}
{{ setconfig('custom_domain', kvm_parameter_dict.get('domain', '')) }}
{{ setconfig('custom_domain', kvm_parameter_dict.get('domain', '')) }}
config-enable_cache = {{ dumps(frontend_parameter_dict.get('enable-cache', False)) }}
config-enable_cache = {{ dumps(frontend_parameter_dict.get('enable-cache', False)) }}
...
...
software/kvm/instance-kvm.cfg.jinja2
View file @
2b9655bb
...
@@ -745,7 +745,7 @@ key-file = ${slap-connection:key-file}
...
@@ -745,7 +745,7 @@ key-file = ${slap-connection:key-file}
cert-file = ${slap-connection:cert-file}
cert-file = ${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id}
computer-id = ${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id}
partition-id = ${slap-connection:partition-id}
s
lave
= true
s
hared
= true
config-https-only = True
config-https-only = True
config-type = websocket
config-type = websocket
config-url = https://[${novnc-instance:ip}]:${novnc-instance:port}
config-url = https://[${novnc-instance:ip}]:${novnc-instance:port}
...
...
software/repman/buildout.hash.cfg
View file @
2b9655bb
...
@@ -18,7 +18,7 @@ md5sum = 55c7fd4dd6a39b31878889fbfb00f995
...
@@ -18,7 +18,7 @@ md5sum = 55c7fd4dd6a39b31878889fbfb00f995
[instance-repman.cfg]
[instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in
_update_hash_filename_ = instance-repman.cfg.jinja2.in
md5sum =
dc01433ffed82386a3feee0b34767bed
md5sum =
79e8caeb717277f2e09d54afdeac6398
[config-toml.in]
[config-toml.in]
_update_hash_filename_ = templates/config.toml.in
_update_hash_filename_ = templates/config.toml.in
...
...
software/repman/instance-repman.cfg.jinja2.in
View file @
2b9655bb
...
@@ -671,7 +671,7 @@ software-url = {{ frontend_parameter_dict.get('frontend-software-url', 'http://g
...
@@ -671,7 +671,7 @@ software-url = {{ frontend_parameter_dict.get('frontend-software-url', 'http://g
{% if frontend_parameter_dict.get('frontend-software-type', '') -%}
{% if frontend_parameter_dict.get('frontend-software-type', '') -%}
software-type ={{ frontend_parameter_dict['frontend-software-type'] }}
software-type ={{ frontend_parameter_dict['frontend-software-type'] }}
{% endif -%}
{% endif -%}
s
lave
= true
s
hared
= true
config-url = ${nginx-parameter:backend-ssl-url}
config-url = ${nginx-parameter:backend-ssl-url}
config-domain = {{ frontend_parameter_dict.get('slave-domain', '') }}
config-domain = {{ frontend_parameter_dict.get('slave-domain', '') }}
return = domain secure_access
return = domain secure_access
...
...
software/restic-rest-server/buildout.hash.cfg
View file @
2b9655bb
...
@@ -15,4 +15,4 @@
...
@@ -15,4 +15,4 @@
[instance.cfg.in]
[instance.cfg.in]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
a5a05e6949d78882bde4d53fb21cdd00
md5sum =
573e23c88fea6a11ab5c79b1eb106601
software/restic-rest-server/instance.cfg.in
View file @
2b9655bb
...
@@ -177,7 +177,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -177,7 +177,7 @@ recipe = slapos.cookbook:requestoptional
name = Rest Server Frontend
name = Rest Server Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = ${rest-server:url}
config-url = ${rest-server:url}
return = domain secure_access
return = domain secure_access
...
...
software/slapos-master/buildout.hash.cfg
View file @
2b9655bb
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# not need these here).
# not need these here).
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
ce9c231ec47eb8f528345add21cb7822
md5sum =
6d9b94b50ea46b0b98c9019d74780876
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
...
...
software/slapos-master/instance-erp5.cfg.in
View file @
2b9655bb
...
@@ -465,7 +465,7 @@ recipe = slapos.cookbook:request
...
@@ -465,7 +465,7 @@ recipe = slapos.cookbook:request
software-url = {{ dumps(frontend_dict['software-url']) }}
software-url = {{ dumps(frontend_dict['software-url']) }}
software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
{{ root_common.sla('frontend', True) }}
{{ root_common.sla('frontend', True) }}
s
lave
= true
s
hared
= true
{% set config_dict = {
{% set config_dict = {
'type': 'zope',
'type': 'zope',
} -%}
} -%}
...
...
software/slaprunner/buildout.hash.cfg
View file @
2b9655bb
...
@@ -18,7 +18,7 @@ md5sum = 473325442cba8ee32642d1e5e3fa94f4
...
@@ -18,7 +18,7 @@ md5sum = 473325442cba8ee32642d1e5e3fa94f4
[template-runner]
[template-runner]
filename = instance-runner.cfg
filename = instance-runner.cfg
md5sum =
8d284c9257250afd83a1463662a56d0
8
md5sum =
03d3774fcb01a8ec68a23de31fb346b
8
[template-runner-import-script]
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
filename = template/runner-import.sh.jinja2
...
...
software/slaprunner/instance-runner.cfg
View file @
2b9655bb
...
@@ -65,7 +65,7 @@ global-ipv6 = $${slap-configuration:ipv6-random}
...
@@ -65,7 +65,7 @@ global-ipv6 = $${slap-configuration:ipv6-random}
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
software-url = {{ slapparameter_dict.get('custom-frontend-software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') }}
software-url = {{ slapparameter_dict.get('custom-frontend-software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') }}
software-type = {{ slapparameter_dict.get('custom-frontend-software-type', 'RootSoftwareInstance') }}
software-type = {{ slapparameter_dict.get('custom-frontend-software-type', 'RootSoftwareInstance') }}
s
lave
= true
s
hared
= true
name = Custom Web Frontend
name = Custom Web Frontend
server-url = $${slap-connection:server-url}
server-url = $${slap-connection:server-url}
...
@@ -529,7 +529,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -529,7 +529,7 @@ recipe = slapos.cookbook:requestoptional
name = SlapRunner Frontend
name = SlapRunner Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = $${slaprunner:access-url}
config-url = $${slaprunner:access-url}
config-domain = $${slap-parameter:frontend-domain}
config-domain = $${slap-parameter:frontend-domain}
return = site_url domain
return = site_url domain
...
@@ -548,7 +548,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -548,7 +548,7 @@ recipe = slapos.cookbook:requestoptional
name = Monitor Frontend
name = Monitor Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = $${apache-httpd:access-url}
config-url = $${apache-httpd:access-url}
config-domain =
config-domain =
return = secure_access domain
return = secure_access domain
...
...
software/theia/buildout.hash.cfg
View file @
2b9655bb
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[instance-theia]
[instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in
_update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum =
56ad229756d2d57971c583104370dcc7
md5sum =
153be75bad8e1f38fbf05fedbf99650d
[instance]
[instance]
_update_hash_filename_ = instance.cfg.in
_update_hash_filename_ = instance.cfg.in
...
...
software/theia/instance-theia.cfg.jinja.in
View file @
2b9655bb
...
@@ -179,7 +179,7 @@ config-command = $${embedded-instance-requested-promise-script:output}
...
@@ -179,7 +179,7 @@ config-command = $${embedded-instance-requested-promise-script:output}
[remote-frontend-base]
[remote-frontend-base]
<= slap-connection
<= slap-connection
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
s
lave
= true
s
hared
= true
config-url = $${frontend-instance:url}
config-url = $${frontend-instance:url}
config-https-only = true
config-https-only = true
config-type = websocket
config-type = websocket
...
...
software/unstable/ajaxplorer/buildout.hash.cfg
View file @
2b9655bb
...
@@ -18,7 +18,7 @@ md5sum = 1fbb72e4305ded9614ee80c0ee17b672
...
@@ -18,7 +18,7 @@ md5sum = 1fbb72e4305ded9614ee80c0ee17b672
[instance-apache]
[instance-apache]
filename = instance-apachephp.cfg
filename = instance-apachephp.cfg
md5sum = a
1ddbb63ffa0041b27eaea6df85cbd00
md5sum = a
9bc574f838985b8b8b165e2ce12fe61
[website1-template]
[website1-template]
filename = templates/index.html.in
filename = templates/index.html.in
...
...
software/unstable/ajaxplorer/instance-apachephp.cfg
View file @
2b9655bb
...
@@ -258,7 +258,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -258,7 +258,7 @@ recipe = slapos.cookbook:requestoptional
name = Frontend-Website
name = Frontend-Website
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url}
software-url = $${slap-parameter:frontend-software-url}
s
lave
= true
s
hared
= true
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url
return = site_url
config-custom_domain = $${slap-parameter:domain}
config-custom_domain = $${slap-parameter:domain}
...
@@ -269,7 +269,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -269,7 +269,7 @@ recipe = slapos.cookbook:requestoptional
name = Frontend-FileManager
name = Frontend-FileManager
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url}
software-url = $${slap-parameter:frontend-software-url}
s
lave
= true
s
hared
= true
config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port2}/
config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port2}/
return = site_url
return = site_url
config-custom_domain = $${slap-parameter:domain2}
config-custom_domain = $${slap-parameter:domain2}
...
@@ -280,7 +280,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -280,7 +280,7 @@ recipe = slapos.cookbook:requestoptional
name = Frontend-Website2
name = Frontend-Website2
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url}
software-url = $${slap-parameter:frontend-software-url}
s
lave
= true
s
hared
= true
config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port3}/
config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port3}/
return = site_url
return = site_url
config-custom_domain = $${slap-parameter:domain3}
config-custom_domain = $${slap-parameter:domain3}
...
...
software/unstable/cdn-me/instance-cdn-request.cfg.jinja2
View file @
2b9655bb
...
@@ -26,7 +26,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -26,7 +26,7 @@ recipe = slapos.cookbook:requestoptional
name = WebSite Frontend
name = WebSite Frontend
software-url = product.frontend
software-url = product.frontend
software-type = custom-personal
software-type = custom-personal
s
lave
= true
s
hared
= true
{% if slapparameter_dict.get('port', '80') != '443' %}
{% if slapparameter_dict.get('port', '80') != '443' %}
config-url = http://[$${request-re6stnet-token-slave:connection-ipv6}1]:{{ slapparameter_dict.get('port', '80') }}
config-url = http://[$${request-re6stnet-token-slave:connection-ipv6}1]:{{ slapparameter_dict.get('port', '80') }}
...
@@ -108,7 +108,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -108,7 +108,7 @@ recipe = slapos.cookbook:requestoptional
name = Re6st token Frontend
name = Re6st token Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = product.re6st
software-url = product.re6st
s
lave
= true
s
hared
= true
return = token info_1 ipv6 ipv4
return = token info_1 ipv6 ipv4
[request-monitor-test-distributor-slave]
[request-monitor-test-distributor-slave]
...
@@ -118,7 +118,7 @@ name = Monitor Test
...
@@ -118,7 +118,7 @@ name = Monitor Test
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = product.monitor
software-url = product.monitor
software-type = distributor
software-type = distributor
s
lave
= true
s
hared
= true
config-ping6_ip_list = $${request-re6stnet-token-slave:connection-ipv6}
config-ping6_ip_list = $${request-re6stnet-token-slave:connection-ipv6}
config-ping_ip_list = $${request-re6stnet-token-slave:connection-ipv4}
config-ping_ip_list = $${request-re6stnet-token-slave:connection-ipv4}
...
@@ -131,7 +131,7 @@ name = Monitor Frontend
...
@@ -131,7 +131,7 @@ name = Monitor Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = product.frontend
software-url = product.frontend
software-type = custom-personal
software-type = custom-personal
s
lave
= true
s
hared
= true
config-url = $${request-monitor-test-distributor-slave:connection-site_url}
config-url = $${request-monitor-test-distributor-slave:connection-site_url}
return = site_url domain
return = site_url domain
...
...
software/unstable/davstorage/buildout.hash.cfg
View file @
2b9655bb
...
@@ -4,4 +4,4 @@ md5sum = bed788dee6daf05349c4577e7a7f1299
...
@@ -4,4 +4,4 @@ md5sum = bed788dee6daf05349c4577e7a7f1299
[instance-davstorage]
[instance-davstorage]
filename = instance-davstorage.cfg
filename = instance-davstorage.cfg
md5sum =
081f97f9e575af7a4b7f9afc7c80dd4a
md5sum =
5a5068ef80a830df56b88c0ec84f2202
software/unstable/davstorage/instance-davstorage.cfg
View file @
2b9655bb
...
@@ -165,7 +165,7 @@ recipe = slapos.cookbook:request
...
@@ -165,7 +165,7 @@ recipe = slapos.cookbook:request
name = Frontend Ajax
name = Frontend Ajax
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-https-only = true
config-https-only = true
config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
return = domain
return = domain
...
@@ -176,7 +176,7 @@ recipe = slapos.cookbook:request
...
@@ -176,7 +176,7 @@ recipe = slapos.cookbook:request
name = Frontend Webdav
name = Frontend Webdav
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-https-only = true
config-https-only = true
config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
return = domain
return = domain
...
...
software/unstable/etherpad-lite/buildout.hash.cfg
View file @
2b9655bb
...
@@ -4,7 +4,7 @@ md5sum = 7ab2a242df988bf5c10bf8002acac3bd
...
@@ -4,7 +4,7 @@ md5sum = 7ab2a242df988bf5c10bf8002acac3bd
[instance-etherpad-lite]
[instance-etherpad-lite]
_update_hash_filename_ = instance-etherpad-lite.cfg
_update_hash_filename_ = instance-etherpad-lite.cfg
md5sum =
7ead62829a85f5922bb9ed0fc8dfb0df
md5sum =
0c6ce178d13147e0df0bd2bbba0f0b0c
[template-conf]
[template-conf]
_update_hash_filename_ = templates/settings.json.in
_update_hash_filename_ = templates/settings.json.in
...
...
software/unstable/etherpad-lite/instance-etherpad-lite.cfg
View file @
2b9655bb
...
@@ -66,7 +66,7 @@ recipe = slapos.cookbook:request
...
@@ -66,7 +66,7 @@ recipe = slapos.cookbook:request
name = Frontend
name = Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port}
config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port}
return = site_url
return = site_url
...
...
software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in
View file @
2b9655bb
...
@@ -164,7 +164,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -164,7 +164,7 @@ recipe = slapos.cookbook:requestoptional
name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition-id}
name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition-id}
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = http://[$${instance-parameter:ipv6-random}]:5000
config-url = http://[$${instance-parameter:ipv6-random}]:5000
return = site_url
return = site_url
...
...
software/unstable/lamp-generic/instance-apache-php.cfg.in
View file @
2b9655bb
...
@@ -150,7 +150,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -150,7 +150,7 @@ recipe = slapos.cookbook:requestoptional
name = Frontend
name = Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url
return = site_url
config-custom_domain = $${slap-parameter:domain}
config-custom_domain = $${slap-parameter:domain}
...
...
software/unstable/trac-svn/instance-trac.cfg
View file @
2b9655bb
...
@@ -435,7 +435,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -435,7 +435,7 @@ recipe = slapos.cookbook:requestoptional
name = Frontend
name = Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = http://[$${slap-network-information:global-ipv6}]:8080
config-url = http://[$${slap-network-information:global-ipv6}]:8080
return = site_url
return = site_url
config-custom_domain = $${slap-parameter:domain}
config-custom_domain = $${slap-parameter:domain}
...
...
stack/erp5/buildout.hash.cfg
View file @
2b9655bb
...
@@ -74,7 +74,7 @@ md5sum = a75e8cf8fd664de164a88a680ddd2c9e
...
@@ -74,7 +74,7 @@ md5sum = a75e8cf8fd664de164a88a680ddd2c9e
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
3d8f3a440b7423c3b947c6ea4d775c6e
md5sum =
52dfc0c9a4547b1e928707ef5caeecdb
[template-zeo]
[template-zeo]
filename = instance-zeo.cfg.in
filename = instance-zeo.cfg.in
...
...
stack/erp5/instance-erp5.cfg.in
View file @
2b9655bb
...
@@ -434,7 +434,7 @@ recipe = slapos.cookbook:request
...
@@ -434,7 +434,7 @@ recipe = slapos.cookbook:request
software-url = {{ dumps(frontend_dict['software-url']) }}
software-url = {{ dumps(frontend_dict['software-url']) }}
software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
{{ root_common.sla('frontend', True) }}
{{ root_common.sla('frontend', True) }}
s
lave
= true
s
hared
= true
{% set config_dict = {
{% set config_dict = {
'type': 'zope',
'type': 'zope',
} -%}
} -%}
...
...
stack/lamp/buildout.hash.cfg
View file @
2b9655bb
...
@@ -22,7 +22,7 @@ md5sum = 8506f245087dfdc02561e8739a567bd6
...
@@ -22,7 +22,7 @@ md5sum = 8506f245087dfdc02561e8739a567bd6
[instance-lamp]
[instance-lamp]
filename = instance-lamp.cfg.jinja2.in
filename = instance-lamp.cfg.jinja2.in
md5sum =
79343539dff96f2d4592a4358d46920
1
md5sum =
3ff36cb2d10f53f932ba9ee99b5fe9e
1
[template-apache.conf]
[template-apache.conf]
filename = apache.conf.in
filename = apache.conf.in
...
...
stack/lamp/instance-lamp.cfg.jinja2.in
View file @
2b9655bb
...
@@ -69,7 +69,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -69,7 +69,7 @@ recipe = slapos.cookbook:requestoptional
name = Instance Frontend
name = Instance Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = ${request-apache:connection-backend-url}
config-url = ${request-apache:connection-backend-url}
config-https-only = true
config-https-only = true
return = domain secure_access
return = domain secure_access
...
...
stack/monitor/buildout.hash.cfg
View file @
2b9655bb
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# not need these here).
# not need these here).
[monitor2-template]
[monitor2-template]
filename = instance-monitor.cfg.jinja2.in
filename = instance-monitor.cfg.jinja2.in
md5sum =
7e7b964f324d803d40112e88cc8d75d8
md5sum =
255b4f5f2d960ec958899114cef4cfd9
[monitor-httpd-conf]
[monitor-httpd-conf]
_update_hash_filename_ = templates/monitor-httpd.conf.in
_update_hash_filename_ = templates/monitor-httpd.conf.in
...
...
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
2b9655bb
...
@@ -344,7 +344,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -344,7 +344,7 @@ recipe = slapos.cookbook:requestoptional
name = Monitor Frontend ${monitor-instance-parameter:monitor-title}
name = Monitor Frontend ${monitor-instance-parameter:monitor-title}
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = ${monitor-httpd-conf-parameter:url}
config-url = ${monitor-httpd-conf-parameter:url}
config-https-only = true
config-https-only = true
#software-type = custom-personal
#software-type = custom-personal
...
...
stack/resilient/buildout.hash.cfg
View file @
2b9655bb
...
@@ -30,7 +30,7 @@ md5sum = 1b8645835f04081861266436505fd28f
...
@@ -30,7 +30,7 @@ md5sum = 1b8645835f04081861266436505fd28f
[template-replicated]
[template-replicated]
filename = template-replicated.cfg.in
filename = template-replicated.cfg.in
md5sum =
ba90373d7ba062a6b8117b821a2d7765
md5sum =
52762882e0d631f51d2c9e5f8b31c0b6
[template-parts]
[template-parts]
filename = template-parts.cfg.in
filename = template-parts.cfg.in
...
...
stack/resilient/template-replicated.cfg.in
View file @
2b9655bb
...
@@ -178,7 +178,7 @@ config-command = ${resilient-request-{{namebase}}-pseudo-replicating-{{id}}-publ
...
@@ -178,7 +178,7 @@ config-command = ${resilient-request-{{namebase}}-pseudo-replicating-{{id}}-publ
## The PBS and their push / pull s
lav
es
## The PBS and their push / pull s
hared instanc
es
## Adding a PBS provides resiliency
## Adding a PBS provides resiliency
## Adding a backup server provides availability
## Adding a backup server provides availability
...
@@ -201,7 +201,7 @@ config-monitor-title = PBS ${slap-connection:computer-id}-{{namebase}}-{{id}}
...
@@ -201,7 +201,7 @@ config-monitor-title = PBS ${slap-connection:computer-id}-{{namebase}}-{{id}}
config-{{ key }} = {{ value }}
config-{{ key }} = {{ value }}
{% endfor -%}
{% endfor -%}
return = ssh-key notification-url feeds-url {{ monitor_return }}
return = ssh-key notification-url feeds-url {{ monitor_return }}
s
lave
= false
s
hared
= false
{% if sla_parameter_dict == {} -%}
{% if sla_parameter_dict == {} -%}
sla-mode = unique_by_network
sla-mode = unique_by_network
{% else %}
{% else %}
...
@@ -253,7 +253,7 @@ config-notification-id = ${slap-connection:computer-id}-${slap-connection:partit
...
@@ -253,7 +253,7 @@ config-notification-id = ${slap-connection:computer-id}-${slap-connection:partit
config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}
config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}
config-title = Pulling from {{namebase}}
config-title = Pulling from {{namebase}}
config-remove-backup-older-than = {{ slapparameter_dict.get('remove-backup-older-than', '2W') }}
config-remove-backup-older-than = {{ slapparameter_dict.get('remove-backup-older-than', '2W') }}
s
lave
= true
s
hared
= true
sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
[publish-connection-information]
[publish-connection-information]
...
@@ -282,7 +282,7 @@ config-notify = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-noti
...
@@ -282,7 +282,7 @@ config-notify = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-noti
config-notification-id = ${request-{{namebase}}-pseudo-replicating-{{id}}:pbs-notification-id}
config-notification-id = ${request-{{namebase}}-pseudo-replicating-{{id}}:pbs-notification-id}
config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}
config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}
config-title = Pushing to {{namebase}} backup {{id}}
config-title = Pushing to {{namebase}} backup {{id}}
s
lave
= true
s
hared
= true
sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
{% endfor %}
{% endfor %}
...
...
stack/unstable/boinc/instance-boinc.cfg
View file @
2b9655bb
...
@@ -300,7 +300,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -300,7 +300,7 @@ recipe = slapos.cookbook:requestoptional
name = Frontend
name = Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url
return = site_url
config-custom_domain = $${slap-parameter:domain}
config-custom_domain = $${slap-parameter:domain}
...
...
stack/unstable/lapp/apache/instance-apache-php.cfg.in
View file @
2b9655bb
...
@@ -231,7 +231,7 @@ recipe = slapos.cookbook:requestoptional
...
@@ -231,7 +231,7 @@ recipe = slapos.cookbook:requestoptional
name = Frontend
name = Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
s
lave
= true
s
hared
= true
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url
return = site_url
config-custom_domain = $${slap-parameter:domain}
config-custom_domain = $${slap-parameter:domain}
...
...
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