#var/ipfire/outgoing/p2protocols
#var/ipfire/outgoing/rules
#var/ipfire/outgoing/settings
+var/ipfire/ovpn
+var/ipfire/ovpn/ccd.conf
+var/ipfire/ovpn/ccdroute
+var/ipfire/ovpn/ccdroute2
var/ipfire/pakfire
#var/ipfire/pakfire/settings
#var/ipfire/patches
etc/issue
srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/routing.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/local/bin/launch-ether-wake
usr/sbin/ovpn-ccd-convert
var/ipfire/general-functions.pl
var/ipfire/langs
}
if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
+ # Convert subnet masks to CIDR notation.
+ $settings{'IP'} = &General::iporsubtocidr($settings{'IP'});
# Validate inputs
if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){
#
sub BuildConfiguration {
system '/usr/local/bin/rebuildroutes';
-}
\ No newline at end of file
+}
for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns \
ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \
net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \
- outgoing/groups/macgroups patches pakfire portfw ppp private proxy/advanced/cre \
+ outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \
proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \
updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
wakeonlan wireless xtaccess ; do \
dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \
isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
- pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
+ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s %s", argv[2], argv[1]);
safe_system(command);
+ /* Send magic packet with broadcast flag set. */
+ snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s -b %s", argv[2], argv[1]);
+ safe_system(command);
+
return(0);
}
#!/usr/bin/perl
-
+# Converter script for old openvpn clients
my %net=();
my %ovpnconfig=();
my @serverconf=();
my $greennet;
my $greensubnet;
my $running='off';
-require '/var/ipfire/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
+unless (-d "${General::swroot}/ovpn/ccd") { system("mkdir ${General::swroot}/ovpn/ccd"); }
+system ("chown nobody.nobody ${General::swroot}/ovpn/ccd");
if ( -e "/var/run/openvpn.pid"){
$running='on';
system('/usr/local/bin/openvpnctrl', '-k');
{
system('/usr/local/bin/openvpnctrl', '-s');
}
+system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*");