Update stunnel section to work with new version

parent 97180299
...@@ -18,7 +18,7 @@ offline = true ...@@ -18,7 +18,7 @@ offline = true
[url] [url]
recipe = slapos.cookbook:publishurl recipe = slapos.cookbook:publishurl
url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-address}]:$${stunnel:remote-port}/$${mariadb:database} url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-host}]:$${stunnel:remote-port}/$${mariadb:database}
[mariadb] [mariadb]
recipe = slapos.cookbook:mysql recipe = slapos.cookbook:mysql
...@@ -92,10 +92,11 @@ key-file = $${ca-stunnel:key-file} ...@@ -92,10 +92,11 @@ key-file = $${ca-stunnel:key-file}
cert-file = $${ca-stunnel:cert-file} cert-file = $${ca-stunnel:cert-file}
pid-file = $${basedirectory:run}/stunnel.pid pid-file = $${basedirectory:run}/stunnel.pid
local-port = $${mariadb:port} local-port = $${mariadb:port}
local-address = $${mariadb:ip} local-host = $${mariadb:ip}
remote-address = $${slap-network-information:global-ipv6} remote-host = $${slap-network-information:global-ipv6}
remote-port = 6446 remote-port = 6446
client = false client = false
post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
[logrotate] [logrotate]
recipe = slapos.cookbook:logrotate recipe = slapos.cookbook:logrotate
...@@ -128,13 +129,13 @@ dcrond-binary = ${dcron:location}/sbin/crond ...@@ -128,13 +129,13 @@ dcrond-binary = ${dcron:location}/sbin/crond
cron-entries = $${directory:cron-entries} cron-entries = $${directory:cron-entries}
crontabs = $${directory:crontabs} crontabs = $${directory:crontabs}
cronstamps = $${directory:cronstamps} cronstamps = $${directory:cronstamps}
catcher = $${cron-simplelogger:binary} catcher = $${cron-simplelogger:wrapper}
binary = $${basedirectory:services}/crond binary = $${basedirectory:services}/crond
[cron-simplelogger] [cron-simplelogger]
recipe = slapos.cookbook:simplelogger recipe = slapos.cookbook:simplelogger
binary = $${rootdirectory:bin}/cron_simplelogger wrapper = $${rootdirectory:bin}/cron_simplelogger
output = $${directory:cronoutput} log = $${basedirectory:log}/crond.log
[cron-entry-logrotate] [cron-entry-logrotate]
<= cron <= cron
......
...@@ -48,7 +48,7 @@ mode = 0644 ...@@ -48,7 +48,7 @@ mode = 0644
[instance-mariadb] [instance-mariadb]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-mariadb.cfg url = ${:_profile_base_location_}/instance-mariadb.cfg
md5sum = 135ad8e59a45e053f3aaf75deb35c5b0 md5sum = d160bb15d8d3a3913706a4ed29c49388
output = ${buildout:directory}/template-mariadb.cfg output = ${buildout:directory}/template-mariadb.cfg
mode = 0644 mode = 0644
......
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