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
Nirina Malard
slapos
Commits
eae6e174
Commit
eae6e174
authored
Mar 21, 2021
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
re6stnet: softwaretype -> switch-softwaretype
parent
f3726080
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
14 deletions
+7
-14
software/re6stnet/buildout.hash.cfg
software/re6stnet/buildout.hash.cfg
+2
-2
software/re6stnet/instance-re6stnet.cfg.in
software/re6stnet/instance-re6stnet.cfg.in
+1
-8
software/re6stnet/instance.cfg.in
software/re6stnet/instance.cfg.in
+4
-4
No files found.
software/re6stnet/buildout.hash.cfg
View file @
eae6e174
...
@@ -14,11 +14,11 @@
...
@@ -14,11 +14,11 @@
# not need these here).
# not need these here).
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
eea691b0919812b9717f17005f06681d
md5sum =
99e8d2b0a0a937ca21d449b542fd8f45
[template-re6stnet]
[template-re6stnet]
filename = instance-re6stnet.cfg.in
filename = instance-re6stnet.cfg.in
md5sum = 0
66c1e4e0b97a39bd40da56622921791
md5sum = 0
a5e61e126ed5138e8d04fbb7670ae95
[template-apache-conf]
[template-apache-conf]
filename = apache.conf.in
filename = apache.conf.in
...
...
software/re6stnet/instance-re6stnet.cfg.in
View file @
eae6e174
...
@@ -118,7 +118,7 @@ key-file = ${re6st-registry-conf-dict:key}
...
@@ -118,7 +118,7 @@ key-file = ${re6st-registry-conf-dict:key}
cert-file = ${re6st-registry-conf-dict:ca}
cert-file = ${re6st-registry-conf-dict:ca}
dh-file = ${re6st-registry-conf-dict:dh}
dh-file = ${re6st-registry-conf-dict:dh}
slave-instance-list =
${slap-parameter:slave_instance_list
}
slave-instance-list =
{{ slapparameter_dict.get('slave_instance_list', '{}') }
}
environment =
environment =
PATH={{ openssl_bin }}
PATH={{ openssl_bin }}
...
@@ -194,10 +194,3 @@ parts =
...
@@ -194,10 +194,3 @@ parts =
re6st-registry-promise
re6st-registry-promise
apache-registry-promise
apache-registry-promise
monitor-base
monitor-base
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[slap-parameter]
slave_instance_list = {}
software/re6stnet/instance.cfg.in
View file @
eae6e174
...
@@ -16,8 +16,6 @@ recipe = slapos.recipe.template:jinja2
...
@@ -16,8 +16,6 @@ recipe = slapos.recipe.template:jinja2
rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
extra-context =
extra-context =
context =
context =
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key ipv6_set slap-configuration:ipv6
key ipv6_set slap-configuration:ipv6
key ipv4_set slap-configuration:ipv4
key ipv4_set slap-configuration:ipv4
key slapparameter_dict slap-configuration:configuration
key slapparameter_dict slap-configuration:configuration
...
@@ -43,7 +41,9 @@ extra-context =
...
@@ -43,7 +41,9 @@ extra-context =
raw monitor2_template_rendered {{ monitor2_template_rendered }}
raw monitor2_template_rendered {{ monitor2_template_rendered }}
[switch-softwaretype]
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:s
witch-s
oftwaretype
default =
${dynamic-template-re6stnet:rendered}
default =
dynamic-template-re6stnet:rendered
registry = ${:default}
registry = ${:default}
# BBB
RootSoftwareInstance = ${:default}
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