reynir/albatross
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes

Browse source
This commit is contained in:
Hannes Mehnert 2019-01-13 22:02:16 +01:00
parent 623a449ea2
commit c0189178e5
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/vmmd_influx.ml
View file

@ -104,7 +104,7 @@ module P = struct
let fields = let fields =
[ "vsize", i64 mem.vsize ; [ "vsize", i64 mem.vsize ;
"rss", i64 mem.rss ; "rss", i64 mem.rss ;
"rsize", i64 mem.tsize ; "tsize", i64 mem.tsize ;
"dsize", i64 mem.dsize ; "dsize", i64 mem.dsize ;
"ssize", i64 mem.ssize ; "ssize", i64 mem.ssize ;
] ]

6
app/vmmp_ca.ml
View file

@ -130,13 +130,17 @@ let days =
let doc = "Number of days" in let doc = "Number of days" in
Arg.(value & opt int 1 & info [ "days" ] ~doc) 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 sign_cmd =
let doc = "sign a request" in let doc = "sign a request" in
let man = let man =
[`S "DESCRIPTION"; [`S "DESCRIPTION";
`P "Signs the certificate signing request."] `P "Signs the certificate signing request."]
in 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 Term.info "sign" ~doc ~man
let help_cmd = let help_cmd =

2
app/vmmp_request.ml
View file

@ -199,7 +199,7 @@ let default_cmd =
`P "$(tname) connects to vmmd via a local socket" ] `P "$(tname) connects to vmmd via a local socket" ]
in in
Term.(ret (const help $ setup_log $ Term.man_format $ Term.choice_names $ Term.pure None)), 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 ; let cmds = [ help_cmd ; info_cmd ;
policy_cmd ; remove_policy_cmd ; add_policy_cmd ; policy_cmd ; remove_policy_cmd ; add_policy_cmd ;

4
packaging/MANIFEST
View file

@ -75,8 +75,8 @@ messages [
add path 'vmm/solo5*' mode 0660 group albatross add path 'vmm/solo5*' mode 0660 group albatross
* start TLS endpoint via inetd on port 49, add to /etc/inetd.conf: * start TLS endpoint via inetd on port 1025, 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 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 and add cacert.pem server.pem and server.key to /usr/local/etc/albatross