cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

ocserv: simplify IPv6 network setting

Browse Source 
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos
2015-10-31 12:21:16 +01:00
parent b703519216
commit 3e0e8c3863
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/ocserv/files/ocserv.conf.template
-1
View File
@@ -268,7 +268,6 @@ ipv4-netmask = |NETMASK|
# The IPv6 subnet that leases will be given from. # The IPv6 subnet that leases will be given from.
|ENABLE_IPV6|ipv6-network = |IPV6ADDR| |ENABLE_IPV6|ipv6-network = |IPV6ADDR|
|ENABLE_IPV6|ipv6-prefix = |IPV6PREFIX|
# The domains over which the provided DNS should be used. Use # The domains over which the provided DNS should be used. Use
# multiple lines for multiple domains. # multiple lines for multiple domains.
net/ocserv/files/ocserv.init
+1 -5
View File
@@ -31,9 +31,6 @@ setup_config() {
test -z $default_domain && enable_default_domain="" test -z $default_domain && enable_default_domain=""
test -z $ip6addr && enable_ipv6="#" 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\]" test $auth = "plain" && authsuffix="\[passwd=/var/etc/ocpasswd\]"
dyndns="false" dyndns="false"
@@ -55,8 +52,7 @@ setup_config() {
-e "s/|COMPRESSION|/$enable_compression/g" \ -e "s/|COMPRESSION|/$enable_compression/g" \
-e "s/|IPV4ADDR|/$ipaddr/g" \ -e "s/|IPV4ADDR|/$ipaddr/g" \
-e "s/|NETMASK|/$netmask/g" \ -e "s/|NETMASK|/$netmask/g" \
-e "s/|IPV6ADDR|/$ipv6_addr/g" \ -e "s#|IPV6ADDR|#$ip6addr#g" \
-e "s/|IPV6PREFIX|/$ipv6_prefix/g" \
-e "s/|ENABLE_IPV6|/$enable_ipv6/g" \ -e "s/|ENABLE_IPV6|/$enable_ipv6/g" \
/etc/ocserv/ocserv.conf.template > /var/etc/ocserv.conf /etc/ocserv/ocserv.conf.template > /var/etc/ocserv.conf
} }