Merge pull request #15436 from pprindeville/strongswan-gencerts-change-sysconfdir
strongswan: change name of config base directory
This commit is contained in:
commit
e1abf0c3c7
2 changed files with 4 additions and 4 deletions
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=strongswan
|
||||
PKG_VERSION:=5.9.2
|
||||
PKG_RELEASE:=5
|
||||
PKG_RELEASE:=6
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/
|
||||
|
|
|
@ -34,8 +34,8 @@ SHORT_DOMAIN="${DOMAIN%%.*}"
|
|||
ORG="$1"; shift
|
||||
|
||||
# invariants...
|
||||
STRONGSWANDIR=/etc
|
||||
SWANCTL_DIR=$STRONGSWANDIR/swanctl
|
||||
SYSCONFDIR=/etc
|
||||
SWANCTL_DIR="$SYSCONFDIR/swanctl"
|
||||
: ${KEYINFO:="rsa:4096"}
|
||||
: ${CADAYS:=3650}
|
||||
: ${CRTDAYS:=730}
|
||||
|
@ -140,7 +140,7 @@ ROOTDN="$(makeDN "$C" "$ORG" "Root CA")"
|
|||
|
||||
[ -f "$SWANCTL_DIR/x509ca/$SHORT_DOMAIN.crt" ] || genca
|
||||
|
||||
PARENT="$STRONGSWANDIR"
|
||||
PARENT="$SYSCONFDIR"
|
||||
BASEDIR="${SWANCTL_DIR##$PARENT/}"
|
||||
|
||||
for name in "$@"; do
|
||||
|
|
Loading…
Reference in a new issue