add --postgres-password cmdline arg + make keys
This commit is contained in:
parent
42b7e13eae
commit
6cb6a96784
11 changed files with 84 additions and 53 deletions
|
|
@ -85,10 +85,8 @@ let url =
|
|||
let doc = "url" in
|
||||
Arg.(required & opt (some string) None & info [ "url" ] ~doc)
|
||||
|
||||
let setup_cmd =
|
||||
let doc =
|
||||
"Generate offline master keys, write private and public key to file"
|
||||
in
|
||||
let generate_eddsa_key_cmd =
|
||||
let doc = "Generate a Ed25519 key pair" in
|
||||
let output =
|
||||
let doc = "private key output file" in
|
||||
Arg.(required & opt (some filepath) None & info [ "o"; "output" ] ~doc)
|
||||
|
|
@ -100,11 +98,11 @@ let setup_cmd =
|
|||
in
|
||||
Arg.(value & opt (some filepath) None & info [ "output-pubkey" ] ~doc)
|
||||
in
|
||||
Cmd.make (Cmd.info "setup" ~doc)
|
||||
Cmd.make (Cmd.info "generate-eddsa-key" ~doc)
|
||||
@@
|
||||
let+ output = output and+ output_pubkey = output_pubkey in
|
||||
let output_pubkey = Option.value ~default:(output ^ ".pub") output_pubkey in
|
||||
setup ~output ~output_pubkey
|
||||
generate_eddsa_key ~output ~output_pubkey
|
||||
|
||||
let download_cmd =
|
||||
let doc =
|
||||
|
|
@ -333,7 +331,7 @@ let cli =
|
|||
in
|
||||
Cmd.group info
|
||||
[
|
||||
setup_cmd;
|
||||
generate_eddsa_key_cmd;
|
||||
download_cmd;
|
||||
sign_cmd;
|
||||
upload_cmd;
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ let upload ~input ~url =
|
|||
% ("@" ^ input)
|
||||
% url)
|
||||
|
||||
let setup ~output ~output_pubkey =
|
||||
let generate_eddsa_key ~output ~output_pubkey =
|
||||
Result.unwrap_err
|
||||
@@
|
||||
let priv, pub = Mirage_crypto_ec.Ed25519.generate () in
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue