* The CSS definition has been removed from the config.pl file and

[BackupPC.git] / configure.pl

diff --git a/configure.pl b/configure.pl
index fe04994..1f787df 100755 (executable)
--- a/configure.pl
+++ b/configure.pl
@@ -15,7 +15,7 @@
 #   Craig Barratt <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
 #   Craig Barratt <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT

-#   Copyright (C) 2001-2003  Craig Barratt
+#   Copyright (C) 2001-2004  Craig Barratt

 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by


@@ -432,6 +432,7 @@ foreach my $lib ( qw(
        BackupPC/Xfer/Tar.pm
         BackupPC/Xfer/Smb.pm
        BackupPC/Xfer/Rsync.pm
        BackupPC/Xfer/Tar.pm
         BackupPC/Xfer/Smb.pm
        BackupPC/Xfer/Rsync.pm

+       BackupPC/Xfer/RsyncDigest.pm

         BackupPC/Xfer/RsyncFileIO.pm
        BackupPC/Zip/FileMember.pm
         BackupPC/Lang/en.pm
         BackupPC/Xfer/RsyncFileIO.pm
        BackupPC/Zip/FileMember.pm
         BackupPC/Lang/en.pm


@@ -469,6 +470,16 @@ if ( $Conf{CgiImageDir} ne "" ) {
        (my $destImg = $img) =~ s{^images/}{};
        InstallFile($img, "$Conf{CgiImageDir}/$destImg", 0444, 1);
     }
        (my $destImg = $img) =~ s{^images/}{};
        InstallFile($img, "$Conf{CgiImageDir}/$destImg", 0444, 1);
     }

+
+    #
+    # Install new CSS file, making a backup copy if necessary
+    #
+    my $cssBackup = "$Conf{CgiImageDir}/BackupPC_stnd.css.pre-__VERSION__";
+    if ( -f "$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) {
+       rename("$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup);
+    }
+    InstallFile("conf/BackupPC_stnd.css",
+               "$Conf{CgiImageDir}/BackupPC_stnd.css", 0444, 0);

 }
 
 printf("Making init.d scripts\n");
 }
 
 printf("Making init.d scripts\n");


@@ -532,6 +543,11 @@ if ( defined($Conf{SmbClientArgs}) ) {
     delete($Conf{SmbClientArgs});
 }
 
     delete($Conf{SmbClientArgs});
 }
 

+#
+# CSS is now stored in a file rather than a big config variable.
+#
+delete($Conf{CSSstylesheet});
+

 #
 # The blackout timing settings are now stored in a list of hashes, rather
 # than three scalar parameters.
 #
 # The blackout timing settings are now stored in a list of hashes, rather
 # than three scalar parameters.


@@ -549,6 +565,19 @@ if ( defined($Conf{BlackoutHourBegin}) ) {
     delete($Conf{BlackoutWeekDays});
 }
 
     delete($Conf{BlackoutWeekDays});
 }
 

+#
+# $Conf{RsyncLogLevel} has been replaced by $Conf{XferLogLevel}
+#
+if ( defined($Conf{RsyncLogLevel}) ) {
+    $Conf{XferLogLevel} = $Conf{RsyncLogLevel};
+    delete($Conf{RsyncLogLevel});
+}
+
+#
+# In 2.1.0 the default for $Conf{CgiNavBarAdminAllHosts} is now 1
+#
+$Conf{CgiNavBarAdminAllHosts} = 1;
+

 #
 # IncrFill should now be off
 #
 #
 # IncrFill should now be off
 #


@@ -664,7 +693,7 @@ EOF
 if ( `$Conf{PerlPath} -V` =~ /uselargefiles=undef/ ) {
     print <<EOF;
 
 if ( `$Conf{PerlPath} -V` =~ /uselargefiles=undef/ ) {
     print <<EOF;
 

-WARNING: your perl, $Conf{PerlPath}, does not support large files.
+Warning: your perl, $Conf{PerlPath}, does not support large files.

 This means BackupPC won't be able to backup files larger than 2GB.
 To solve this problem you should build/install a new version of perl
 with large file support enabled.  Use
 This means BackupPC won't be able to backup files larger than 2GB.
 To solve this problem you should build/install a new version of perl
 with large file support enabled.  Use


@@ -672,10 +701,15 @@ with large file support enabled.  Use
     $Conf{PerlPath} -V | egrep uselargefiles
 
 to check if perl has large file support (undef means no support).
     $Conf{PerlPath} -V | egrep uselargefiles
 
 to check if perl has large file support (undef means no support).

-

 EOF
 }
 
 EOF
 }
 

+eval "use File::RsyncP;";
+if ( !$@ && $File::RsyncP::VERSION < 0.50 ) {
+    print("\nWarning: you need to upgrade File::RsyncP;"
+        . " I found $File::RsyncP::VERSION and BackupPC needs 0.50\n");
+}
+

 exit(0);
 
 ###########################################################################
 exit(0);
 
 ###########################################################################