浏览代码

add better examples for server and client

Waldemar Brodkorb 14 年之前
父节点
当前提交
0e75f1280a
共有 3 个文件被更改,包括 14 次插入15 次删除
  1. 13 3
      package/openvpn/Makefile
  2. 0 11
      package/openvpn/files/openvpn.conf
  3. 1 1
      package/openvpn/files/openvpn.conffiles

+ 13 - 3
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 \

+ 0 - 11
package/openvpn/files/openvpn.conf

@@ -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

+ 1 - 1
package/openvpn/files/openvpn.conffiles

@@ -1 +1 @@
-/etc/openvpn/openvpn.conf
+/etc/openvpn/server.conf