diff --git a/app/vmmd_influx.ml b/app/vmmd_influx.ml index 41925de..f383b1f 100644 --- a/app/vmmd_influx.ml +++ b/app/vmmd_influx.ml @@ -104,7 +104,7 @@ module P = struct let fields = [ "vsize", i64 mem.vsize ; "rss", i64 mem.rss ; - "rsize", i64 mem.tsize ; + "tsize", i64 mem.tsize ; "dsize", i64 mem.dsize ; "ssize", i64 mem.ssize ; ] diff --git a/app/vmmp_ca.ml b/app/vmmp_ca.ml index 17ab303..af0d661 100644 --- a/app/vmmp_ca.ml +++ b/app/vmmp_ca.ml @@ -130,13 +130,17 @@ let days = let doc = "Number of days" in Arg.(value & opt int 1 & info [ "days" ] ~doc) +let cacert = + let doc = "cacert" in + Arg.(required & pos 0 (some file) None & info [] ~doc ~docv:"CACERT") + let sign_cmd = let doc = "sign a request" in let man = [`S "DESCRIPTION"; `P "Signs the certificate signing request."] in - Term.(ret (const sign $ setup_log $ db $ Vmm_provision.cacert $ key $ csr $ days)), + Term.(ret (const sign $ setup_log $ db $ cacert $ key $ csr $ days)), Term.info "sign" ~doc ~man let help_cmd = diff --git a/app/vmmp_request.ml b/app/vmmp_request.ml index 9943a09..757e29e 100644 --- a/app/vmmp_request.ml +++ b/app/vmmp_request.ml @@ -199,7 +199,7 @@ let default_cmd = `P "$(tname) connects to vmmd via a local socket" ] in Term.(ret (const help $ setup_log $ Term.man_format $ Term.choice_names $ Term.pure None)), - Term.info "vmmc_local" ~version:"%%VERSION_NUM%%" ~doc ~man + Term.info "vmmp_request" ~version:"%%VERSION_NUM%%" ~doc ~man let cmds = [ help_cmd ; info_cmd ; policy_cmd ; remove_policy_cmd ; add_policy_cmd ; diff --git a/packaging/MANIFEST b/packaging/MANIFEST index 7bab7dd..dc12c0e 100644 --- a/packaging/MANIFEST +++ b/packaging/MANIFEST @@ -75,8 +75,8 @@ messages [ add path 'vmm/solo5*' mode 0660 group albatross - * start TLS endpoint via inetd on port 49, add to /etc/inetd.conf: -tacacs stream tcp nowait albatross /usr/local/libexec/albatross/vmmd_tls_inetd vmmd_tls_inetd /usr/local/etc/albatross/cacert.pem /usr/local/etc/albatross/server.pem /usr/local/etc/albatross/server.key + * start TLS endpoint via inetd on port 1025, add to /etc/inetd.conf: +blackjack stream tcp nowait albatross /usr/local/libexec/albatross/vmmd_tls_inetd vmmd_tls_inetd /usr/local/etc/albatross/cacert.pem /usr/local/etc/albatross/server.pem /usr/local/etc/albatross/server.key and add cacert.pem server.pem and server.key to /usr/local/etc/albatross