repam: cleanup, fix parameter json schema

software/repman/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = da50540b1c0fc69ffbf8f6e345a3baad
 
 [instance-repman.cfg]
 _update_hash_filename_ = instance-repman.cfg.jinja2.in
-md5sum = 2b5552d587e7735b4ff6daec24fcb8c1
+md5sum = bba44129ccd30440f636d1f53f876919
 
 [config-toml.in]
 _update_hash_filename_ = templates/config.toml.in
@@ -58,7 +58,7 @@ md5sum = 99324b56192003254081ef336dcee94c
 
 [dbjobs-in]
 _update_hash_filename_ = templates/dbjobs.in
-md5sum = 9731eff8918fa3e68198de6b1d45ecfa
+md5sum = 870c849268b5ec0c22d8ee0668bebbc9
 
 [mysqld-need-start.sh.in]
 _update_hash_filename_ = templates/mysqld-need-start.sh.in

software/repman/instance-repman-output-schema.json

@@ -5,21 +5,18 @@
       "title": "Backend URL",
       "description": "URL used to connect directly to backend without frontend. Requires IPv6.",
       "type": "string",
-      "format": "uri",
-      "require": true
+      "format": "uri"
     },
     "url": {
       "title": "URL",
       "description": "URL used to connect to the service.",
       "type": "string",
-      "format": "uri",
-      "require": false
+      "format": "uri"
     },
     "repman-password": {
       "title": "Repman password",
       "description": "Password for Replication Manager service.",
-      "type": "string",
-      "require": false
+      "type": "string"
     }
   }
 }

software/repman/instance-repman.cfg.jinja2.in

@@ -220,7 +220,9 @@ config-port = {{ '${' ~ name ~ '-cluster-parameter:proxy-port}' }}
 
 {% set service_name = "proxysql-" ~ name -%}
 {% set proxysql_dict = {"name": service_name, "command": "${" ~ service_name ~ "-wrapper:wrapper-path}",
-  "stopwaitsecs": 60, "environment": []} %}
+  "stopwaitsecs": 60, "environment": [],
+  "stdout_logfile": "${repman:proxies-log}/" ~ service_name ~ ".log",
+  "stderr_logfile": "${repman:proxies-log}/" ~ service_name ~ ".log" } %}
 
 {{ supervisord_lib.supervisord_program(proxysql_controller, service_name, proxysql_dict) }}
 {% do part_list.append(proxysql_controller ~ "-" ~ service_name) %}
@@ -256,6 +258,7 @@ proxies  = ${:etc}/proxy
 proxy-data = ${:data-dir}/proxy
 config-tmp = ${directory:tmp}/config
 bootstrap = ${:etc}/bootstrap
+proxies-log = ${directory:log}/proxy
 
 [nginx-parameter]
 ipv6 = ${instance-parameter:ipv6-random}

software/repman/software.cfg

@@ -31,11 +31,6 @@ parts =
   template-mysqld-wrapper
   gowork
 
-
-[mariadb]
-# Compile dir is for plugins, there's no plugin yet
-keep-compile-dir = false
-
 [instance.cfg]
 recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/instance.cfg
@@ -152,5 +147,5 @@ link-binary =
 
 # Pin versions of eggs used that are not already pinned by stack/slapos.cfg
 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 rubygemsrecipe  = 0.2.2+slapos001

software/repman/software.cfg.json

@@ -5,6 +5,7 @@
   "software-type": {
     "default": {
       "title": "Default",
+      "serialisation": "json-in-xml",
       "description": "Replication Manager",
       "request": "instance-repman-input-schema.json",
       "response": "instance-repman-output-schema.json",

software/repman/templates/dbjobs.in

@@ -58,7 +58,6 @@ partialRestore()
 }
 
 kill -9 $(lsof -t -i:{{ parameter_dict['socat-port'] }} -sTCP:LISTEN)
-kill -9 $(lsof -t -i:{{ parameter_dict['socat-port'] }} -sTCP6:LISTEN)
 
 for job in "${JOBS[@]}"
 do