Merge branch 'ovpn_colour' of https://github.com/hadfl/ipfire-2.x into next

This commit is contained in:
Michael Tremer
2014-07-19 11:32:18 +02:00

View File

@@ -238,6 +238,23 @@ if (-e "${General::swroot}/ovpn/settings") {
}
}
# Add OpenVPN net for custom OVPNs
if (-e "${General::swroot}/ovpn/ccd.conf") {
open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf");
my @ovpnsub = <OVPNSUB>;
close(OVPNSUB);
foreach (@ovpnsub) {
my ($network, $mask) = split '/', (split ',', $_)[2];
$mask = ipv4_cidr2msk($mask) unless &General::validip($mask);
push(@network, $network);
push(@masklen, $mask);
push(@colour, ${Header::colourovpn});
}
}
open(IPSEC, "${General::swroot}/vpn/config");
my @ipsec = <IPSEC>;
close(IPSEC);