require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
-
+use File::Path;
my $debug = 1;
my @include = "";
my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat, $Jahr, $Wochentag, $Jahrestag, $Sommerzeit) = localtime(time);
print DATEI @include;
print "/var/log/messages";
close(DATEI);
- system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'");
+ system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude' --files-from='/var/ipfire/backup/include.user' --exclude-from='/var/ipfire/backup/exclude.user'");
system("rm /tmp/include");
if ($ARGV[0] eq 'iso') {
system("/usr/local/bin/backupiso $Jahr$Monat$Monatstag-$Stunden$Minuten &");
open(DATEI, ">/tmp/include") || die "Could not save temp include file";
print DATEI @include;
close(DATEI);
- system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'");
+ system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude' --files-from='/var/ipfire/backup/include.user' --exclude-from='/var/ipfire/backup/exclude.user'");
system("rm /tmp/include");
}
elsif ($ARGV[0] eq 'restore') {
- system("cd / && tar -xvz --preserve -f /tmp/restore.ipf");
+ system("cd / && tar -xvz -p -f /tmp/restore.ipf");
+ #Here some converter scripts to correct old Backups (before core 65)
+ system("/usr/sbin/ovpn-ccd-convert");
+ #OUTGOINGFW CONVERTER
+ if( -d "${General::swroot}/outgoing"){
+ if( -f "${General::swroot}/firewall/config" ){
+ unlink("${General::swroot}/firewall/config");
+ system("touch ${General::swroot}/firewall/config");
+ chown 99,99,"${General::swroot}/firewall/config";
+ }
+ if( -f "${General::swroot}/firewall/outgoing" ){
+ unlink("${General::swroot}/firewall/outgoing");
+ system("touch ${General::swroot}/firewall/outgoing");
+ chown 99,99,"${General::swroot}/firewall/outgoing";
+ }
+ unlink("${General::swroot}/fwhosts/customgroups");
+ unlink("${General::swroot}/fwhosts/customhosts");
+ unlink("${General::swroot}/fwhosts/customgroups");
+ unlink("${General::swroot}/fwhosts/customnetworks");
+ unlink("${General::swroot}/fwhosts/customservicegrp");
+ unlink("${General::swroot}/fwhosts/customnetworks");
+ system("touch ${General::swroot}/fwhosts/customgroups");
+ system("touch ${General::swroot}/fwhosts/customhosts");
+ system("touch ${General::swroot}/fwhosts/customnetworks");
+ system("touch ${General::swroot}/fwhosts/customservicegrp");
+ #START CONVERTER "OUTGOINGFW"
+ system("/usr/sbin/convert-outgoingfw");
+ chown 99,99,"${General::swroot}/fwhosts/customgroups";
+ chown 99,99,"${General::swroot}/fwhosts/customhosts";
+ chown 99,99,"${General::swroot}/fwhosts/customnetworks";
+ chown 99,99,"${General::swroot}/fwhosts/customservicegrp";
+ #START CONVERTER "OUTGOINGFW"
+ rmtree("${General::swroot}/outgoing");
+ }
+ #XTACCESS CONVERTER
+ if( -d "${General::swroot}/xtaccess"){
+ if( -f "${General::swroot}/firewall/input" ){
+ unlink("${General::swroot}/firewall/input");
+ system("touch ${General::swroot}/firewall/input");
+ }
+ #START CONVERTER "XTACCESS"
+ system("/usr/sbin/convert-xtaccess");
+ chown 99,99,"${General::swroot}/firewall/input";
+ rmtree("${General::swroot}/xtaccess");
+ }
+ #DMZ-HOLES CONVERTER
+ if( -d "${General::swroot}/dmzholes" || -d "${General::swroot}/portfw"){
+ if( -f "${General::swroot}/firewall/config" ){
+ unlink("${General::swroot}/firewall/config");
+ system("touch ${General::swroot}/firewall/config");
+ }
+ #START CONVERTER "DMZ-HOLES"
+ system("/usr/sbin/convert-dmz");
+ chown 99,99,"${General::swroot}/firewall/config";
+ rmtree("${General::swroot}/dmzholes");
+ }
+ #PORTFORWARD CONVERTER
+ if( -d "${General::swroot}/portfw"){
+ #START CONVERTER "PORTFW"
+ system("/usr/sbin/convert-portfw");
+ rmtree("${General::swroot}/portfw");
+ }
+ system("/usr/local/bin/firewallctrl");
+ }
+
+ # Convert old OpenVPN CCD files (CN change, core 75).
+ system("/usr/local/bin/convert-ovpn");
}
elsif ($ARGV[0] eq 'restoreaddon') {
if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}
- system("cd / && tar -xvz --preserve -f /var/ipfire/backup/addons/backup/$ARGV[1]");
+ system("cd / && tar -xvz -p -f /var/ipfire/backup/addons/backup/$ARGV[1]");
}
elsif ($ARGV[0] eq 'cli') {
system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten-$ARGV[1].ipf --files-from='$ARGV[2]' --exclude-from='$ARGV[3]'");
elsif ($ARGV[0] =~ /ipf$/ ) {
system("rm /var/ipfire/backup/$ARGV[0]");
}
+elsif ($ARGV[0] =~ /iso$/ ) {
+ system("rm /var/tmp/backupiso/$ARGV[0]");
+}
elsif ($ARGV[0] eq '') {
printf "No argument given, please use <include><exclude><cli>\n"
}