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
zhifan huang
slapos
Commits
9646cba9
Commit
9646cba9
authored
Jul 01, 2021
by
Lisa Casino
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
htmlvalidatorserver: switch to switch-softwaretype
parent
26c0685b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
25 deletions
+21
-25
software/htmlvalidatorserver/buildout.hash.cfg
software/htmlvalidatorserver/buildout.hash.cfg
+2
-2
software/htmlvalidatorserver/instance-validator.cfg.in
software/htmlvalidatorserver/instance-validator.cfg.in
+1
-1
software/htmlvalidatorserver/instance.cfg.in
software/htmlvalidatorserver/instance.cfg.in
+18
-21
software/htmlvalidatorserver/software.cfg
software/htmlvalidatorserver/software.cfg
+0
-1
No files found.
software/htmlvalidatorserver/buildout.hash.cfg
View file @
9646cba9
...
@@ -22,8 +22,8 @@ md5sum = 87781e6bcb523bb8434888d5f984f36c
...
@@ -22,8 +22,8 @@ md5sum = 87781e6bcb523bb8434888d5f984f36c
[template-validator]
[template-validator]
filename = instance-validator.cfg.in
filename = instance-validator.cfg.in
md5sum =
e2ab378e4eb4b418a958fc90309ca443
md5sum =
9d12472bb2e337d3cc18f2cc6f235425
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
2b4d33e9ef1082dd4d6a53f55b391772
md5sum =
94fc13254c819cba33b03f30251bc469
software/htmlvalidatorserver/instance-validator.cfg.in
View file @
9646cba9
...
@@ -49,7 +49,7 @@ recipe = slapos.recipe.template
...
@@ -49,7 +49,7 @@ recipe = slapos.recipe.template
url = ${template-tomcat-configuration:output}
url = ${template-tomcat-configuration:output}
output = $${basedirectory:catalina_conf}/server.xml
output = $${basedirectory:catalina_conf}/server.xml
mode = 0600
mode = 0600
ip =
$${slap-network-information:global-ipv6
}
ip =
{{ partition_ipv6 }
}
port = 8899
port = 8899
scheme = https
scheme = https
...
...
software/htmlvalidatorserver/instance.cfg.in
View file @
9646cba9
...
@@ -6,29 +6,26 @@ eggs-directory = ${buildout:eggs-directory}
...
@@ -6,29 +6,26 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
offline = true
[switch-softwaretype]
[dynamic-template-validator]
recipe = slapos.cookbook:softwaretype
recipe = slapos.recipe.template:jinja2
default = $${:validator}
template = ${template-validator:output}
validator = ${template-validator:output}
rendered = $${buildout:parts-directory}/$${:_buildout_section_name_}/$${:filename}
filename = instance-validator.cfg
[slap-connection]
context =
# part to migrate to new - separated words
# partition_ipv6 is the random ipv6 allocated to the local partition
computer-id = $${slap_connection:computer_id}
key partition_ipv6 slap-configuration:ipv6-random
partition-id = $${slap_connection:partition_id}
server-url = $${slap_connection:server_url}
software-release-url = $${slap_connection:software_release_url}
key-file = $${slap_connection:key_file}
cert-file = $${slap_connection:cert_file}
# [slap-parameter]
[switch-softwaretype]
# slave-instance-list = []
recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:validator}
validator = dynamic-template-validator:rendered
[
instance-parameter
]
[
slap-configuration
]
# Fetches parameters defined in SlapOS Master for this instance.
# Fetches parameters defined in SlapOS Master for this instance.
# Always the same.
# Always the same.
recipe = slapos.cookbook:slapconfiguration.serialised
recipe = slapos.cookbook:slapconfiguration.serialised
computer = $${slap
_connection:computer_
id}
computer = $${slap
-connection:computer-
id}
partition = $${slap
_connection:partition_
id}
partition = $${slap
-connection:partition-
id}
url = $${slap
_connection:server_
url}
url = $${slap
-connection:server-
url}
key = $${slap
_connection:key_
file}
key = $${slap
-connection:key-
file}
cert = $${slap
_connection:cert_
file}
cert = $${slap
-connection:cert-
file}
software/htmlvalidatorserver/software.cfg
View file @
9646cba9
...
@@ -49,5 +49,4 @@ mode = 0644
...
@@ -49,5 +49,4 @@ mode = 0644
# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
# 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
# but '1.3.4nxd2-SlapOSPatched001'.
# but '1.3.4nxd2-SlapOSPatched001'.
gunicorn = 19.1.1
gunicorn = 19.1.1
plone.recipe.command = 1.1
inotifyx = 0.2.2
inotifyx = 0.2.2
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