Merge branch 'master' into fifteen

Conflicts:
	config/backup/backup.pl
This commit is contained in:
Michael Tremer
2014-01-09 13:31:25 +01:00
6 changed files with 70 additions and 1 deletions

View File

@@ -3947,7 +3947,6 @@ if ($cgiparams{'TYPE'} eq 'net') {
if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){
unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}";
}
$confighash{$key}[2] =~ s/ /_/gi;
open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!";
print CCDRWCONF "# OpenVPN clientconfig from ccd extension by Copymaster#\n\n";
if($cgiparams{'CHECK1'} eq 'dynamic'){