pyrox.dev
1diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
2index 261336f..7b9a79b 100755
3--- a/easyrsa3/easyrsa
4+++ b/easyrsa3/easyrsa
5@@ -1661,7 +1661,7 @@ Note: using Easy-RSA configuration from: $vars"
6
7 # Set defaults, preferring existing env-vars if present
8 set_var EASYRSA "$prog_dir"
9- set_var EASYRSA_OPENSSL openssl
10+ set_var EASYRSA_OPENSSL "@openssl@"
11 set_var EASYRSA_PKI "$PWD/pki"
12 set_var EASYRSA_DN cn_only
13 set_var EASYRSA_REQ_COUNTRY "US"
14@@ -1683,16 +1683,31 @@ Note: using Easy-RSA configuration from: $vars"
15 set_var EASYRSA_TEMP_DIR "$EASYRSA_PKI"
16 set_var EASYRSA_REQ_CN ChangeMe
17 set_var EASYRSA_DIGEST sha256
18- set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf"
19- set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf"
20 set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM"
21
22+ if [ -f "$EASYRSA_PKI/safessl-easyrsa.conf" ]; then
23+ set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf"
24+ elif [ -f "$EASYRSA/safessl-easyrsa.conf" ]; then
25+ set_var EASYRSA_SAFE_CONF "$EASYRSA/safessl-easyrsa.cnf"
26+ elif [ -f "@out@/share/easyrsa/safessl-easyrsa.cnf" ]; then
27+ set_var EASYRSA_SAFE_CONF "@out@/share/easyrsa/safessl-easyrsa.cnf"
28+ fi
29+
30+ if [ -f "$EASYRSA_PKI/openssl-easyrsa.conf" ]; then
31+ set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf"
32+ elif [ -f "$EASYRSA/openssl-easyrsa.conf" ]; then
33+ set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf"
34+ elif [ -f "@out@/share/easyrsa/openssl-easyrsa.cnf" ]; then
35+ set_var EASYRSA_SSL_CONF "@out@/share/easyrsa/openssl-easyrsa.cnf"
36+ fi
37+
38 # Same as above for the x509-types extensions dir
39 if [ -d "$EASYRSA_PKI/x509-types" ]; then
40 set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/x509-types"
41- else
42- #TODO: This should be removed. Not really suitable for packaging.
43+ elif [ -d "$EASYRSA/x509-types" ]; then
44 set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types"
45+ else
46+ set_var EASYRSA_EXT_DIR "@out@/share/easyrsa/x509-types"
47 fi
48
49 # EASYRSA_ALGO_PARAMS must be set depending on selected algo