Skip to content

Commit

Permalink
Merge branch 'TinCanTech-make-vars'
Browse files Browse the repository at this point in the history
Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Sep 17, 2023
2 parents 7f3c350 + 582aade commit a409867
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Easy-RSA 3 ChangeLog

3.2.0 (TBD)
* New command: make-vars - Print vars.example (here-doc) to stdout (#1024)
* show-expire: Calculate cert. expire seconds from DB date (#1023)
* Forbid "default vars in the default PKI" for all commands (#1021)
There can be only one default vars file, that is now './vars' ONLY.
Expand Down
12 changes: 12 additions & 0 deletions easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,9 @@ cmd_help() {
# Test features
text_only=1
text="
Print vars.example here-doc to stdout:
make-vars

Make safessl-easyrsa.cnf file:
mss|make-safe-ssl

Expand Down Expand Up @@ -5827,6 +5830,7 @@ Remove 'unset' ('force_set_var' may also work)."
# shellcheck disable=SC2034 # appears unused
EASYRSA_CALLER=1
easyrsa_path="$PATH"
# shellcheck disable=SC2123 # PATH is the shell ..
PATH=./

# Test sourcing 'vars' in a subshell
Expand Down Expand Up @@ -7304,6 +7308,14 @@ case "$cmd" in
esac
esac

# Run these commands with NO setup
case "$cmd" in
make-vars)
create_vars_example
cleanup ok
;;
esac

# Intelligent env-var detection and auto-loading:
vars_setup

Expand Down

0 comments on commit a409867

Please sign in to comment.