diff options
| -rw-r--r-- | package/openvpn/Makefile | 16 | ||||
| -rw-r--r-- | package/openvpn/files/openvpn.conf | 11 | ||||
| -rw-r--r-- | package/openvpn/files/openvpn.conffiles | 2 |
3 files changed, 14 insertions, 15 deletions
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 7d193d43d..04a381107 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openvpn PKG_VERSION:= 2.2.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 500bee5449b29906150569aaf2eb2730 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net/security @@ -15,7 +15,10 @@ PKG_URL:= http://openvpn.net/ PKG_SITES:= http://openvpn.net/release/ PKG_SUBPKGS:= OPENVPN OPENVPN_EASY_RSA -PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS +PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS SERVER CLIENT +PKGSS_OPENVPN_EASY_RSA:=openssl-util +PKGFD_SERVER:= deliver server example configuration +PKGFD_CLIENT:= deliver client example configuration PKGFD_WITH_LZO:= enable LZO compression support PKGFS_WITH_LZO:= liblzo PKGFB_WITH_LZO:= liblzo @@ -63,7 +66,14 @@ CONFIGURE_ARGS+= --disable-pthread \ post-install: ${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn ${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ - $(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/ +ifeq ($(ADK_PACKAGE_OPENVPN_SERVER),y) + $(CP) ./files/server.conf $(IDIR_OPENVPN)/etc/openvpn/ + echo "/etc/openvpn/server.conf" > ./files/openvpn.conffiles +endif +ifeq ($(ADK_PACKAGE_OPENVPN_CLIENT),y) + $(CP) ./files/server.conf $(IDIR_OPENVPN)/etc/openvpn/ + echo "/etc/openvpn/client.conf" > ./files/openvpn.conffiles +endif openvpn-easy-rsa-install: ${INSTALL_DIR} $(IDIR_OPENVPN_EASY_RSA)/usr/sbin \ diff --git a/package/openvpn/files/openvpn.conf b/package/openvpn/files/openvpn.conf deleted file mode 100644 index d951eaea8..000000000 --- a/package/openvpn/files/openvpn.conf +++ /dev/null @@ -1,11 +0,0 @@ -client -remote server.domain.tld -dev tun -nobind -ca ca.pem -cert client.cer -key client.key -persist-tun -persist-key -comp-lzo -verb 3 diff --git a/package/openvpn/files/openvpn.conffiles b/package/openvpn/files/openvpn.conffiles index e1c04e6eb..f43d51ecc 100644 --- a/package/openvpn/files/openvpn.conffiles +++ b/package/openvpn/files/openvpn.conffiles @@ -1 +1 @@ -/etc/openvpn/openvpn.conf +/etc/openvpn/server.conf |