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
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
406bf60c
Commit
406bf60c
authored
Oct 10, 2024
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/beremiz-runtime: correctly use IPv4 partition
THis is a fixup of
4df39d83
.
parent
4174b297
Pipeline
#37380
passed with stage
in 0 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
software/beremiz-runtime/buildout.hash.cfg
software/beremiz-runtime/buildout.hash.cfg
+1
-1
software/beremiz-runtime/instance.cfg.in
software/beremiz-runtime/instance.cfg.in
+8
-7
No files found.
software/beremiz-runtime/buildout.hash.cfg
View file @
406bf60c
[instance-profile]
[instance-profile]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
011fd9ba538b291545f4e021224357b2
md5sum =
eafb0d0c2137516e884cde56b7016270
software/beremiz-runtime/instance.cfg.in
View file @
406bf60c
...
@@ -29,9 +29,6 @@ key = ${slap-connection:key-file}
...
@@ -29,9 +29,6 @@ key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file}
cert = ${slap-connection:cert-file}
configuration.runtime_plc_url =
configuration.runtime_plc_url =
configuration.runtime_plc_md5sum =
configuration.runtime_plc_md5sum =
configuration.autostart = 1
configuration.interface = ${:ipv4-random}
configuration.port = 8009
# Create all needed directories, depending on your needs
# Create all needed directories, depending on your needs
[directory]
[directory]
...
@@ -47,6 +44,10 @@ log = ${:var}/log
...
@@ -47,6 +44,10 @@ log = ${:var}/log
[beremiz-runtime]
[beremiz-runtime]
logfile = ${directory:log}/beremiz-runtime.log
logfile = ${directory:log}/beremiz-runtime.log
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
# default webport in Beremiz
webport = 8009
# adding BEREMIZPYTHONPATH is needed so we can override the Beremiz'
# adding BEREMIZPYTHONPATH is needed so we can override the Beremiz'
# internal code which tries to use sys.executable to spawn processes
# internal code which tries to use sys.executable to spawn processes
# and in the context of SlapOS it's a plain Python without needed modules
# and in the context of SlapOS it's a plain Python without needed modules
...
@@ -56,6 +57,7 @@ environment =
...
@@ -56,6 +57,7 @@ environment =
BEREMIZPYTHONPATH = {{ buildout['bin-directory'] }}/pythonwitheggs
BEREMIZPYTHONPATH = {{ buildout['bin-directory'] }}/pythonwitheggs
PATH={{ gcc_location }}/bin
PATH={{ gcc_location }}/bin
LIBRARY_PATH={{ openssl_location }}/lib
LIBRARY_PATH={{ openssl_location }}/lib
BEREMIZ_LOCAL_HOST=${instance-parameter:ipv4-random}
command-line =
command-line =
{{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/parts/beremiz-source/Beremiz_cli.py -k --project-home ${directory:home}/parts/download-plc/ build transfer run
{{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/parts/beremiz-source/Beremiz_cli.py -k --project-home ${directory:home}/parts/download-plc/ build transfer run
...
@@ -64,10 +66,9 @@ wrapper-path = ${directory:service}/beremiz-runtime
...
@@ -64,10 +66,9 @@ wrapper-path = ${directory:service}/beremiz-runtime
[http-promise]
[http-promise]
recipe = slapos.cookbook:check_port_listening
recipe = slapos.cookbook:check_port_listening
path = ${directory:promise}/${:_buildout_section_name_}
path = ${directory:promise}/${:_buildout_section_name_}
hostname = ${instance-parameter:
configuration.interface
}
hostname = ${instance-parameter:
ipv4-random
}
port = ${
instance-parameter:configuration.
port}
port = ${
beremiz-runtime:web
port}
[publish-connection-parameter]
[publish-connection-parameter]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
port = ${instance-parameter:configuration.port}
beremiz_runtime_url = http://${instance-parameter:ipv4-random}:${beremiz-runtime:webport}
interface = ${instance-parameter:configuration.interface}
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