diff --git a/extras/vpnupgrade_alpine.sh b/extras/vpnupgrade_alpine.sh index e17a478..e59c4e7 100755 --- a/extras/vpnupgrade_alpine.sh +++ b/extras/vpnupgrade_alpine.sh @@ -149,16 +149,10 @@ install_pkgs() { ( set -x apk add -U -q bash bind-tools coreutils openssl wget iproute2 sed grep \ - libcap-ng libcurl libevent linux-pam musl nspr \ - bison flex gcc make libc-dev bsd-compat-headers linux-pam-dev \ + libcap-ng libcurl libevent linux-pam musl nspr nss nss-tools \ + bison flex gcc make libc-dev bsd-compat-headers linux-pam-dev nss-dev \ libcap-ng-dev libevent-dev curl-dev nspr-dev uuidgen openrc ) || exiterr2 - ( - set -x - apk add -q --no-cache \ - --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \ - nss nss-tools nss-dev - ) || exiterr2 } get_libreswan() { diff --git a/vpnsetup_alpine.sh b/vpnsetup_alpine.sh index 1105b89..a3fdf58 100755 --- a/vpnsetup_alpine.sh +++ b/vpnsetup_alpine.sh @@ -160,16 +160,10 @@ install_vpn_pkgs() { bigecho "Installing packages required for the VPN..." ( set -x - apk add -U -q libcap-ng libcurl libevent linux-pam musl nspr \ - bison flex gcc make libc-dev bsd-compat-headers linux-pam-dev \ + apk add -U -q libcap-ng libcurl libevent linux-pam musl nspr nss nss-tools \ + bison flex gcc make libc-dev bsd-compat-headers linux-pam-dev nss-dev \ libcap-ng-dev libevent-dev curl-dev nspr-dev uuidgen openrc xl2tpd ) || exiterr2 - ( - set -x - apk add -q --no-cache \ - --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \ - nss nss-tools nss-dev - ) || exiterr2 } install_fail2ban() {