Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Thomas Gambier
slapos
Commits
2b9655bb
Commit
2b9655bb
authored
2 years ago
by
Jérome Perrin
Browse files
Options
Download
Email Patches
Plain Diff
*: use new option name for shared requests
parent
a5adb95c
Changes
53
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
22 additions
and
22 deletions
+22
-22
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
No files found.
software/beremiz-ide/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -19,7 +19,7 @@ md5sum = db7fe97f4c6b84cfadb7b5c68eab517a
[template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in
md5sum =
c92317d0d754f62d3259136d1a0df1ac
md5sum =
9d59c9392636ab71f37b43fd8008fd10
[template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in
...
...
This diff is collapsed.
Click to expand it.
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
View file @
2b9655bb
...
...
@@ -213,7 +213,7 @@ output = ${directory:bin}/xterm
[request-vnc-frontend]
<= slap-connection
recipe = slapos.cookbook:requestoptional
s
lave
= true
s
hared
= true
config-https-only = True
config-type = websocket
config-url = https://[${novnc-instance:ip}]:${novnc-instance:port}
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-frontend]
filename = instance-frontend.cfg.in
md5sum =
0ec59d2fb5617e82d1848c1170772d84
md5sum =
ae04e2c6137cb5bd5ef1a9b3c6738c49
[profile-master]
filename = instance-master.cfg.in
...
...
This diff is collapsed.
Click to expand it.
software/caddy-frontend/instance-frontend.cfg.in
View file @
2b9655bb
...
...
@@ -969,7 +969,7 @@ extra-context =
recipe = slapos.cookbook:requestoptional
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
s
lave
= true
s
hared
= true
config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.slave-introspection-https-port'] }}/
config-https-only = true
return = domain secure_access
...
...
@@ -979,7 +979,7 @@ return = domain secure_access
recipe = slapos.cookbook:requestoptional
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
s
lave
= true
s
hared
= true
config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.backend-haproxy-statistic-port'] }}/
config-https-only = true
return = domain secure_access
...
...
This diff is collapsed.
Click to expand it.
software/dufs/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -15,4 +15,4 @@
[instance.cfg.in]
filename = instance.cfg.in
md5sum =
9553d3f24d4201d3320408d8a3154049
md5sum =
0cb3cbac5479581985e5446078217686
This diff is collapsed.
Click to expand it.
software/dufs/instance.cfg.in
View file @
2b9655bb
...
...
@@ -165,7 +165,7 @@ recipe = slapos.cookbook:requestoptional
name = dufs Server Frontend
# XXX We have hardcoded SR URL here.
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}
return = domain secure_access
...
...
This diff is collapsed.
Click to expand it.
software/erp5testnode/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -18,4 +18,4 @@ md5sum = 5bd72da73a8b84f70f568686924d7d6c
[template-default]
filename = instance-default.cfg.jinja.in
md5sum =
0c9ea9fa7417885889a536ec2cf2093f
md5sum =
2aafd7708aac85847da3a8679b84fe34
This diff is collapsed.
Click to expand it.
software/erp5testnode/instance-default.cfg.jinja.in
View file @
2b9655bb
...
...
@@ -236,7 +236,7 @@ output = $${directory:srv}/exporter.exclude
recipe = slapos.cookbook:requestoptional
# XXX We have hardcoded SR URL here.
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
return = domain secure_access
...
...
This diff is collapsed.
Click to expand it.
software/grafana/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -15,7 +15,7 @@
[instance-profile]
filename = instance.cfg.in
md5sum =
6fb42f5663864789ff7b375a9a86888e
md5sum =
94674d597e3ea7e9eca3637a737765ff
[influxdb-config-file]
filename = influxdb-config-file.cfg.in
...
...
This diff is collapsed.
Click to expand it.
software/grafana/instance.cfg.in
View file @
2b9655bb
...
...
@@ -263,7 +263,7 @@ recipe = slapos.cookbook:requestoptional
name = Grafana Frontend
# XXX We have hardcoded SR URL here.
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-https-only = true
return = domain secure_access
...
...
This diff is collapsed.
Click to expand it.
software/headless-chromium/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -4,7 +4,7 @@ md5sum = 6315598b2c7c19f9e2d9cdf090492e2c
[instance-headless-chromium]
_update_hash_filename_ = instance-headless-chromium.cfg.in
md5sum =
a350b7b5ac03971f1b8d66949905c164
md5sum =
feaef60353c94e02d38cfec66f0eb861
[template-nginx-conf]
_update_hash_filename_ = templates/nginx.conf.in
...
...
This diff is collapsed.
Click to expand it.
software/headless-chromium/instance-headless-chromium.cfg.in
View file @
2b9655bb
...
...
@@ -153,7 +153,7 @@ password = ${frontend-instance-password:passwd}
recipe = slapos.cookbook:requestoptional
name = Headless Chromium Remote Debugging Frontend
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-https-only = true
config-type = websocket
...
...
This diff is collapsed.
Click to expand it.
software/html5as/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -21,7 +21,7 @@ md5sum = 23c15a579b66cef866b30a2f53b1b737
[instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in
md5sum =
fc1dd9faf99a4f75e3727b80bb2d59fb
md5sum =
0b16e9a2cac16668e100687f19430b1e
[template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in
...
...
This diff is collapsed.
Click to expand it.
software/html5as/instance_html5as.cfg.in
View file @
2b9655bb
...
...
@@ -221,7 +221,7 @@ name = HTML5AS frontend
# 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
# 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-https-only = true
# The parameter expected to be received from the request are listed here.
...
...
This diff is collapsed.
Click to expand it.
software/hugo/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -15,7 +15,7 @@
[template-cfg]
filename = instance.cfg.in
md5sum =
34f7ab6fe20f685d7d03f2e36f3be207
md5sum =
edddaa4f6145f3eab4463063dacacfaa
[template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in
...
...
This diff is collapsed.
Click to expand it.
software/hugo/instance.cfg.in
View file @
2b9655bb
...
...
@@ -137,7 +137,7 @@ monitor-httpd-port = ${slap-configuration:configuration.hugo-monitor-httpd-port}
recipe = slapos.cookbook:requestoptional
name = Hugo frontend
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-https-only = true
return = domain secure_access
...
...
@@ -229,7 +229,7 @@ post = kill -USR1 $(cat ${hugo:path-pid})
recipe = slapos.cookbook:requestoptional
name = Hugo Nginx frontend
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-https-only = true
return = domain secure_access
...
...
This diff is collapsed.
Click to expand it.
software/jscrawler/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -19,7 +19,7 @@ md5sum = 7333d1dfd4e8e4c375f7f1748292f554
[template-jscrawler]
filename = instance-jscrawler.cfg.jinja2.in
md5sum =
ae9269ab5b1cce77016f822024d2d996
md5sum =
2ba9d6a30b420c9bf67d4a135b48212b
[template-jscrawler-builder]
filename = template-jscrawler.builder.sh.in
...
...
This diff is collapsed.
Click to expand it.
software/jscrawler/instance-jscrawler.cfg.jinja2.in
View file @
2b9655bb
...
...
@@ -41,7 +41,7 @@ recipe = slapos.cookbook:requestoptional
name = jscawler Frontend
# XXX We have hardcoded SR URL here.
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}
return = secure_access domain
...
...
This diff is collapsed.
Click to expand it.
software/jupyter/buildout.hash.cfg
View file @
2b9655bb
...
...
@@ -19,7 +19,7 @@ md5sum = 5f39952f94095b1f12f41db76867e71e
[instance-jupyter]
filename = instance-jupyter.cfg.in
md5sum =
ee2fbb01b4143c19f
a1
6
f8
449ca4ec29
md5sum =
1ac942c544d2a2aa3d1e16a61
a1f8
bc8
[jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja
...
...
This diff is collapsed.
Click to expand it.
software/jupyter/instance-jupyter.cfg.in
View file @
2b9655bb
...
...
@@ -127,7 +127,7 @@ key-file = ${slap-connection:key-file}
cert-file = ${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id}
s
lave
= true
s
hared
= true
config-type = notebook
config-url = https://[${instance-parameter:host}]:${instance-parameter:port}
return = secure_access
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
Next
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