X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FConfig%2FMeta.pm;h=6c35656d8cbbae9a2f50d340cc1dd9a33b6c6c48;hp=a4f54c21a0ea356fdc29caa27c2867febe234023;hb=9cf3998c4ef71332dea96ff3115daf8b9f722acb;hpb=2726b96b1a7026dc3f82250afbfe5ae27ab1c75f

diff --git a/lib/BackupPC/Config/Meta.pm b/lib/BackupPC/Config/Meta.pm
index a4f54c2..6c35656 100644
--- a/lib/BackupPC/Config/Meta.pm
+++ b/lib/BackupPC/Config/Meta.pm
@@ -10,7 +10,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2004-2007  Craig Barratt
+#   Copyright (C) 2004-2009  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
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.1.0beta1, released 23 Sep 2007.
+# Version 3.2.0beta0, released 5 April 2009.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -80,6 +80,7 @@ use vars qw(%ConfigMeta);
     MaxBackupPCNightlyJobs => "integer",
     BackupPCNightlyPeriod  => "integer",
     MaxOldLogFiles      => "integer",
+    CmdQueueNice        => "integer",
 
     SshPath	 	=> {type => "execPath", undefIfEmpty => 1},
     NmbLookupPath 	=> {type => "execPath", undefIfEmpty => 1},
@@ -194,13 +195,16 @@ use vars qw(%ConfigMeta);
     ######################################################################
     XferMethod => {
 	    type   => "select",
-	    values => [qw(archive rsync rsyncd smb tar)],
+	    values => [qw(archive ftp rsync rsyncd smb tar)],
     },
     XferLogLevel	=> "integer",
 
     ClientCharset       => "string",
     ClientCharsetLegacy => "string",
 
+    ######################################################################
+    # Smb Configuration
+    ######################################################################
     SmbShareName 	=> {
 	    type   => "list",
 	    child  => "string",
@@ -212,6 +216,9 @@ use vars qw(%ConfigMeta);
     SmbClientIncrCmd 	=> "string",
     SmbClientRestoreCmd => {type => "string", undefIfEmpty => 1},
 
+    ######################################################################
+    # Tar Configuration
+    ######################################################################
     TarShareName 	=> {
 	    type   => "list",
 	    child  => "string",
@@ -222,6 +229,9 @@ use vars qw(%ConfigMeta);
     TarClientRestoreCmd	=> {type => "string", undefIfEmpty => 1},
     TarClientPath 	=> {type => "string", undefIfEmpty => 1},
 
+    ######################################################################
+    # Rsync Configuration
+    ######################################################################
     RsyncShareName 	=> {
 	    type   => "list",
 	    child  => "string",
@@ -230,17 +240,28 @@ use vars qw(%ConfigMeta);
     RsyncClientCmd 	=> "string",
     RsyncClientRestoreCmd => "string",
 
+    ######################################################################
+    # Rsyncd Configuration
+    ######################################################################
     RsyncdClientPort	=> "integer",
     RsyncdUserName 	=> "string",
     RsyncdPasswd 	=> "string",
     RsyncdAuthRequired	=> "boolean",
 
+    ######################################################################
+    # Rsync(d) Options
+    ######################################################################
     RsyncCsumCacheVerifyProb => "float",
     RsyncArgs	 	=> {
 	    type         => "list",
 	    emptyOk      => 1,
 	    child        => "string",
     },
+    RsyncArgsExtra	 => {
+	    type         => "list",
+	    emptyOk      => 1,
+	    child        => "string",
+    },
     RsyncRestoreArgs	=> {
 	    type         => "list",
 	    emptyOk      => 1,
@@ -248,11 +269,24 @@ use vars qw(%ConfigMeta);
 	    child        => "string",
     },
 
-    BackupPCdCmd        => "string",
-    BackupPCdPath       => "string",
-    BackupPCdShareName  => "string",
-    BackupPCdRestoreCmd => "string",
+    ######################################################################
+    # FTP Configuration
+    ######################################################################
+    FtpShareName        => {
+            type  => "list",
+            child => "string",
+    },
+    FtpUserName         => "string",
+    FtpPasswd           => "string",
+    FtpBlockSize        => "integer",
+    FtpPort             => "integer",
+    FtpTimeout          => "integer",
+    FtpFollowSymlinks   => "boolean",
+    FtpRestoreEnabled   => "boolean",
 
+    ######################################################################
+    # Archive Configuration
+    ######################################################################
     ArchiveDest 	=> "string",
     ArchiveComp		=> {
 	    type   => "select",
@@ -262,6 +296,9 @@ use vars qw(%ConfigMeta);
     ArchiveSplit	=> "float",
     ArchiveClientCmd 	=> "string",
 
+    ######################################################################
+    # Other Client Configuration
+    ######################################################################
     NmbLookupCmd 	=> "string",
     NmbLookupFindHostCmd => "string",
 
@@ -404,10 +441,19 @@ use vars qw(%ConfigMeta);
                 RsyncdAuthRequired        => "boolean",
                 RsyncCsumCacheVerifyProb  => "boolean",
                 RsyncArgs                 => "boolean",
+                RsyncArgsExtra            => "boolean",
                 RsyncRestoreArgs          => "boolean",
                 RsyncClientCmd            => "boolean",
                 RsyncClientPath           => "boolean",
                 RsyncClientRestoreCmd     => "boolean",
+                FtpShareName              => "boolean",
+                FtpUserName               => "boolean",
+                FtpPasswd                 => "boolean",
+                FtpBlockSize              => "boolean",
+                FtpPort                   => "boolean",
+                FtpTimeout                => "boolean",
+                FtpFollowSymlinks         => "boolean",
+                FtpRestoreEnabled         => "boolean",
                 ArchiveDest               => "boolean",
                 ArchiveComp               => "boolean",
                 ArchivePar                => "boolean",