From ce0602189783e69c9fd0afdf46f92fa1b64dddb5 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sat, 31 Oct 2015 12:21:16 +0100 Subject: [PATCH] ocserv: simplify IPv6 network setting Signed-off-by: Nikos Mavrogiannopoulos --- net/ocserv/files/ocserv.conf.template | 1 - net/ocserv/files/ocserv.init | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/net/ocserv/files/ocserv.conf.template b/net/ocserv/files/ocserv.conf.template index dce96d832..842101234 100644 --- a/net/ocserv/files/ocserv.conf.template +++ b/net/ocserv/files/ocserv.conf.template @@ -268,7 +268,6 @@ ipv4-netmask = |NETMASK| # The IPv6 subnet that leases will be given from. |ENABLE_IPV6|ipv6-network = |IPV6ADDR| -|ENABLE_IPV6|ipv6-prefix = |IPV6PREFIX| # The domains over which the provided DNS should be used. Use # multiple lines for multiple domains. diff --git a/net/ocserv/files/ocserv.init b/net/ocserv/files/ocserv.init index c4597a40f..73f73514d 100644 --- a/net/ocserv/files/ocserv.init +++ b/net/ocserv/files/ocserv.init @@ -30,9 +30,6 @@ setup_config() { test -z $default_domain && enable_default_domain="" test -z $ip6addr && enable_ipv6="#" - ipv6_addr=`echo $ip6addr|cut -d '/' -f 1` - ipv6_prefix=`echo $ip6addr|cut -d '/' -f 2` - test $auth = "plain" && authsuffix="\[passwd=/var/etc/ocpasswd\]" dyndns="false" @@ -54,8 +51,7 @@ setup_config() { -e "s/|COMPRESSION|/$enable_compression/g" \ -e "s/|IPV4ADDR|/$ipaddr/g" \ -e "s/|NETMASK|/$netmask/g" \ - -e "s/|IPV6ADDR|/$ipv6_addr/g" \ - -e "s/|IPV6PREFIX|/$ipv6_prefix/g" \ + -e "s#|IPV6ADDR|#$ip6addr#g" \ -e "s/|ENABLE_IPV6|/$enable_ipv6/g" \ /etc/ocserv/ocserv.conf.template > /var/etc/ocserv.conf }