Commit fade0011 authored by Ivan Tyagov's avatar Ivan Tyagov

Cleanup.

parent 7d224225
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 2cf859279c110850bb32c5861669025c md5sum = e294bb63de03a643d1c0bb297d9e1bb7
...@@ -36,7 +36,7 @@ cert = ${slap-connection:cert-file} ...@@ -36,7 +36,7 @@ cert = ${slap-connection:cert-file}
# specify it. # specify it.
# All possible parameters should have a default. # All possible parameters should have a default.
# In our use case, we are expecting from the user to specify one (optional) parameter: "name". We put the default value here if he doesn't specify it, so that it doesn't crash. # In our use case, we are expecting from the user to specify one (optional) parameter: "name". We put the default value here if he doesn't specify it, so that it doesn't crash.
configuration.name = John Doe configuration.port = 1502
# If our use case requires that the user can specify a mail address so that his instance can mail to him (for example), we can do: # If our use case requires that the user can specify a mail address so that his instance can mail to him (for example), we can do:
# configuration.mail-address = # configuration.mail-address =
# If the user doesn't specify it, it won't break and the recipe can handle it (i.e don't send any mail for example). # If the user doesn't specify it, it won't break and the recipe can handle it (i.e don't send any mail for example).
...@@ -67,7 +67,7 @@ log = ${:var}/log ...@@ -67,7 +67,7 @@ log = ${:var}/log
# different IPv6 addresses and they all will be accessible at the same time. # different IPv6 addresses and they all will be accessible at the same time.
ipv6 = ${instance-parameter:ipv6-random} ipv6 = ${instance-parameter:ipv6-random}
# full URL - for convenience # full URL - for convenience
url = http://[${:ipv6}]:${:port} #url = http://[${:ipv6}]:${:port}
# the service will log here # the service will log here
logfile = ${directory:log}/helloweb-${:kind}.log logfile = ${directory:log}/helloweb-${:kind}.log
...@@ -76,7 +76,7 @@ logfile = ${directory:log}/helloweb-${:kind}.log ...@@ -76,7 +76,7 @@ logfile = ${directory:log}/helloweb-${:kind}.log
# This recipe will try to "exec" the command-line after separating parameters. # This recipe will try to "exec" the command-line after separating parameters.
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = command-line =
{{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['parts-directory'] }}/osie/eggs/osie_coupler/osie_modbus.py -p 1502 {{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['parts-directory'] }}/osie/eggs/osie_coupler/osie_modbus.py -p ${instance-parameter:configuration.port}
# Put this shell script in the "etc/service" directory. Each executable of this # Put this shell script in the "etc/service" directory. Each executable of this
# repository will be started and monitored by supervisord. If a service # repository will be started and monitored by supervisord. If a service
# exits/crashes, it will trigger a "bang" and cause a re-run of the instance. # exits/crashes, it will trigger a "bang" and cause a re-run of the instance.
...@@ -123,7 +123,4 @@ parts += ...@@ -123,7 +123,4 @@ parts +=
# Here we'll just echo back the entered name as instance parameter # Here we'll just echo back the entered name as instance parameter
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
name = Hello ${instance-parameter:configuration.name}! port = ${instance-parameter:configuration.port}
{%- for kind in service_list %}
url.{{ kind }} = ${helloweb-{{ kind }}:url}
{%- endfor %}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment