mariadb: listen on ipv6 and register a service on watch

software/mariadb/instance-mariadb.cfg

@@ -19,7 +19,7 @@ offline = true
 
 [url]
 recipe = slapos.cookbook:publishurl
-url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-host}]:$${stunnel:remote-port}/$${mariadb:database}
+url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${mariadb:ip}]:$${mariadb:port}/$${mariadb:database}
 
 [mariadb-cli]
 recipe = slapos.cookbook:wrapper
@@ -36,12 +36,13 @@ recovering = false
 user = user
 password = insecure
 port = 3306
-ip = $${slap-network-information:local-ipv4}
+ip = $${slap-network-information:global-ipv6}
 database = db
 
+
 # Paths
-wrapper = $${basedirectory:services}/mariadb
-update-wrapper = $${basedirectory:services}/mariadb_update
+wrapper = $${basedirectory:service}/mariadb
+update-wrapper = $${basedirectory:service}/mariadb_update
 backup-script = $${rootdirectory:bin}/mariadb_backup
 logrotate-post = $${rootdirectory:bin}/mariadb_post_logrotate
 backup-directory = $${directory:mariadb-backup}
@@ -69,7 +70,7 @@ recipe = slapos.cookbook:certificate_authority
 openssl-binary = ${openssl:location}/bin/openssl
 ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/ca
+wrapper = $${basedirectory:service}/ca
 ca-private = $${cadirectory:private}
 ca-certs = $${cadirectory:certs}
 ca-newcerts = $${cadirectory:newcerts}
@@ -89,7 +90,7 @@ recipe = slapos.cookbook:certificate_authority.request
 key-file = $${directory:stunnel-conf}/stunnel.key
 cert-file = $${directory:stunnel-conf}/stunnel.crt
 executable = $${stunnel:wrapper}
-wrapper = $${basedirectory:services}/stunnel
+wrapper = $${basedirectory:service}/stunnel
 
 [stunnel]
 recipe = slapos.cookbook:stunnel
@@ -139,7 +140,7 @@ cron-entries = $${directory:cron-entries}
 crontabs = $${directory:crontabs}
 cronstamps = $${directory:cronstamps}
 catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
+binary = $${basedirectory:service}/crond
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
@@ -170,7 +171,7 @@ bin = $${buildout:directory}/bin/
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
 log = $${rootdirectory:var}/log/
-services = $${rootdirectory:etc}/run/
+service = $${rootdirectory:etc}/service/
 run = $${rootdirectory:var}/run/
 backup = $${rootdirectory:srv}/backup/