diff --git a/software/neoppod/instance-neo-admin.cfg.in b/software/neoppod/instance-neo-admin.cfg.in index eaa5fd543affbbc4e56ce3e19d7599e4f981eb7e..518a171b9d80c0754e82b38697e2dd0193c62479 100644 --- a/software/neoppod/instance-neo-admin.cfg.in +++ b/software/neoppod/instance-neo-admin.cfg.in @@ -2,6 +2,7 @@ parts += neo-admin-promise logrotate-admin + neoctl [neo-admin] recipe = slapos.cookbook:neoppod.admin @@ -27,3 +28,15 @@ backup = ${logrotate:backup} name = neo-admin log = ${neo-admin:logfile} post = {{ bin_directory }}/slapos-kill -n neoadmin -s RTMIN+1 ${:log} + +[neoctl] +recipe = slapos.cookbook:wrapper +command-line = + {{bin_directory}}/neoctl -a ${neo-admin:ip}:${neo-admin:port} +{%- if slapparameter_dict['ssl'] %} + --ca ${directory:etc}/ca.crt + --cert ${directory:etc}/neo.crt + --key ${directory:etc}/neo.key +{%- endif %} +parameters-extra = True +wrapper-path = ${directory:bin}/neoctl diff --git a/software/neoppod/software-common.cfg b/software/neoppod/software-common.cfg index dc680733be765e561ef44cdba8bf04fb07cd2529..8d510c6f6ae5f23ffc2a3033807c9ee71c22cf73 100644 --- a/software/neoppod/software-common.cfg +++ b/software/neoppod/software-common.cfg @@ -89,7 +89,7 @@ md5sum = f3259726bd5d824c569dc7db6b7d26a0 [instance-neo-admin] <= download-base-neo -md5sum = f030a25d320f2edf0186b69bfa521228 +md5sum = ec1e2d9d2a1da092621f1b01ce6af322 [instance-neo-master] <= download-base-neo