diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-12-03 19:03:30 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-12-03 19:03:30 +0100 |
| commit | 304afaa0c94c25184cd7517765292672df08b921 (patch) | |
| tree | 75eefee9b585c93a84ebefc62fe680154a67a1a1 | |
| parent | 93e2e04bf5ccbe43991e02712e8b3d809ac93e5c (diff) | |
| parent | dfa9a917d7cdf06f44c3bfc1f178481d1fac4902 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/openvpn/Makefile | 2 | ||||
| -rw-r--r-- | package/openvpn/files/openvpn.conffiles | 2 | ||||
| -rw-r--r-- | target/packages/pkg-available/vpn-client | 18 | ||||
| -rw-r--r-- | target/packages/pkg-available/vpn-server | 2 |
4 files changed, 21 insertions, 3 deletions
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index db46d058b..526ada9dd 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -71,7 +71,7 @@ ifeq ($(ADK_PACKAGE_OPENVPN_SERVER),y) echo "/etc/openvpn/server.conf" > ./files/openvpn.conffiles endif ifeq ($(ADK_PACKAGE_OPENVPN_CLIENT),y) - $(CP) ./files/server.conf $(IDIR_OPENVPN)/etc/openvpn/ + $(CP) ./files/client.conf $(IDIR_OPENVPN)/etc/openvpn/ echo "/etc/openvpn/client.conf" > ./files/openvpn.conffiles endif diff --git a/package/openvpn/files/openvpn.conffiles b/package/openvpn/files/openvpn.conffiles index f43d51ecc..e8f42b815 100644 --- a/package/openvpn/files/openvpn.conffiles +++ b/package/openvpn/files/openvpn.conffiles @@ -1 +1 @@ -/etc/openvpn/server.conf +/etc/openvpn/client.conf diff --git a/target/packages/pkg-available/vpn-client b/target/packages/pkg-available/vpn-client new file mode 100644 index 000000000..9075eeaa8 --- /dev/null +++ b/target/packages/pkg-available/vpn-client @@ -0,0 +1,18 @@ +config ADK_PKG_VPN_CLIENT + bool "Compile a OpenVPN client system" + default n + select ADK_PACKAGE_OPENVPN + select ADK_PACKAGE_OPENVPN_WITH_LZO + select ADK_PACKAGE_OPENVPN_WITH_MANAGEMENT + select ADK_PACKAGE_OPENVPN_CLIENT + select ADK_PACKAGE_OPENNTPD + select ADK_PACKAGE_IPTABLES + select ADK_PACKAGE_PPP + select ADK_PACKAGE_PPP_MOD_PPPOE + # optional + select ADK_PACKAGE_VIM + select ADK_PACKAGE_SCREEN + select ADK_PACKAGE_STRACE + select ADK_PACKAGE_TCPDUMP + help + VPN Client system with OpenVPN. diff --git a/target/packages/pkg-available/vpn-server b/target/packages/pkg-available/vpn-server index ad9e9e076..2a8d91ef1 100644 --- a/target/packages/pkg-available/vpn-server +++ b/target/packages/pkg-available/vpn-server @@ -1,5 +1,5 @@ config ADK_PKG_VPN_SERVER - bool "Compile a VPN server system" + bool "Compile a OpenVPN server system" default n select ADK_PACKAGE_OPENVPN select ADK_PACKAGE_OPENVPN_EASY_RSA |