Skip to content

Commit 7e43a5f

Browse files
committedJan 16, 2023
conf: Replace hard-coded /etc where appropriate
Also document the actual value of ${sysconfdir}.
1 parent ee04655 commit 7e43a5f

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed
 

‎conf/options/charon.opt

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ charon.cert_cache = yes
3838
charon.cache_crls = no
3939
Whether Certificate Revocation Lists (CRLs) fetched via HTTP or LDAP should
4040
be saved under a unique file name derived from the public key of the
41-
Certification Authority (CA) to **/etc/ipsec.d/crls** (stroke) or
42-
**/etc/swanctl/x509crl** (vici), respectively.
41+
Certification Authority (CA) to **${sysconfdir}/ipsec.d/crls** (stroke) or
42+
**${sysconfdir}/swanctl/x509crl** (vici), respectively.
4343

4444
charon.check_current_path = no
4545
Whether to use DPD to check if the current path still works after any

‎conf/plugins/unbound.opt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
charon.plugins.unbound.resolv_conf = /etc/resolv.conf
22
File to read DNS resolver configuration from.
33

4-
charon.plugins.unbound.trust_anchors = /etc/ipsec.d/dnssec.keys
4+
charon.plugins.unbound.trust_anchors = ${sysconfdir}/ipsec.d/dnssec.keys
55
File to read DNSSEC trust anchors from (usually root zone KSK).
66

77
File to read DNSSEC trust anchors from (usually root zone KSK). The format

‎conf/strongswan.conf.5.tail.in

+4-3
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ The variables used above are configured as follows:
458458
.na
459459
${piddir} @piddir@
460460
${prefix} @prefix@
461+
${sysconfdir} @sysconfdir@
461462
${random_device} @random_device@
462463
${urandom_device} @urandom_device@
463464
.ad
@@ -467,9 +468,9 @@ ${urandom_device} @urandom_device@
467468
.
468469
.nf
469470
.na
470-
/etc/strongswan.conf configuration file
471-
/etc/strongswan.d/ directory containing included config snippets
472-
/etc/strongswan.d/charon/ plugin specific config snippets
471+
@sysconfdir@/strongswan.conf configuration file
472+
@sysconfdir@/strongswan.d/ directory containing included config snippets
473+
@sysconfdir@/strongswan.d/charon/ plugin specific config snippets
473474
.ad
474475
.fi
475476
.

0 commit comments

Comments
 (0)