Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow vars file to exist in current directory (Fix make-cadir) #635

Merged
merged 2 commits into from
Aug 14, 2022

Conversation

TinCanTech
Copy link
Collaborator

@TinCanTech TinCanTech commented Aug 13, 2022

The utility script 'make-cadir' creates a CA directory with a vars file.
This vars file conflicts with the preferred PKI-vars file.

This patch changes 'init-pki' to allow make-cadir vars file to over-ride
the preferred PKI-vars file, without error.

Closes: #633

Signed-off-by: Richard T Bonhomme tincantech@protonmail.com

The utility script 'make-cadir' creates a CA directory with a vars file.
This vars file conflicts with the preferred PKI-vars file.

This patch changes 'init-pki' to allow make-cadir vars file to over-ride
the preferred PKI-vars file, without error.

Closes: OpenVPN#633

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
Prefer /usr/local/share over /usr/share
and move /etc/easy-rsa to last place.

Tidy up a 'case', no functional change.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
@TinCanTech TinCanTech changed the title https://github.com/OpenVPN/easy-rsa/commit/f4a604438d3ce5fe67a1f4db956dc42fc4ae5588 Allow vars file to exist in current directory (Fix make-cadir) Aug 13, 2022
@TinCanTech TinCanTech self-assigned this Aug 13, 2022
@TinCanTech TinCanTech added this to the v3.1.1-RC1 milestone Aug 13, 2022
Copy link
Collaborator Author

@TinCanTech TinCanTech left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

20f7aaa Closes: #627

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Debian make-cadir copies vars to pki folder. This breaks with current easyrsa.
1 participant