[dw-free] update cgi-bin/LJ/ConfCheck/General.pm

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/c3f4335a9370]

http://bugs.dwscoalition.org/show_bug.cgi?id=2229

Remove obsolete variables and properties from documentation.

Patch by kareila.

Files modified:

• bin/upgrading/proplists.dat
• cgi-bin/LJ/ConfCheck/General.pm
• cgi-bin/ljdefaults.pl
• doc/raw/build/ljconfig/ljconfig2db.pl

--------------------------------------------------------------------------------
diff -r e8fd7995c10e -r c3f4335a9370 bin/upgrading/proplists.dat
--- a/bin/upgrading/proplists.dat	Fri Oct 29 13:56:42 2010 +0800
+++ b/bin/upgrading/proplists.dat	Fri Oct 29 14:09:38 2010 +0800
@@ -37,14 +37,6 @@ userproplist.betafeatures_list:
   indexed: 0
   multihomed: 0
   prettyname: Beta Features List
-
-userproplist.blob_clusterid:
-  cldversion: 0
-  datatype: num
-  des: The ID of the blob cluster user's media resides on.
-  indexed: 1
-  multihomed: 0
-  prettyname: Blob Cluster ID
 
 userproplist.browselang:
   cldversion: 4
diff -r e8fd7995c10e -r c3f4335a9370 cgi-bin/LJ/ConfCheck/General.pm
--- a/cgi-bin/LJ/ConfCheck/General.pm	Fri Oct 29 13:56:42 2010 +0800
+++ b/cgi-bin/LJ/ConfCheck/General.pm	Fri Oct 29 14:09:38 2010 +0800
@@ -764,10 +764,6 @@ add_conf('@QBUFFERD_ISOLATE',
          des => "List of job types that need to fork a separate process."
          );
 
-add_conf('%BLOBINFO',
-         des => "Tell a blobserver where on the filesystem to store data. Probably obsolete!"
-         );
-
 add_conf('$CSSPROXY',
          type => 'url',
          des => "If set, external CSS should be proxied through this URL (URL is given a ?u= argument with the escaped URL of CSS to clean.  If unset, remote CSS is blocked.",
diff -r e8fd7995c10e -r c3f4335a9370 cgi-bin/ljdefaults.pl
--- a/cgi-bin/ljdefaults.pl	Fri Oct 29 13:56:42 2010 +0800
+++ b/cgi-bin/ljdefaults.pl	Fri Oct 29 14:09:38 2010 +0800
@@ -236,15 +236,6 @@ no strict "vars";
             $evt = "LJ::NotificationMethod::$evt";
         }
     }
-    unless (%LJ::BLOBINFO) {
-        %LJ::BLOBINFO = (
-                         clusters => {
-                             1 => "$LJ::HOME/var/blobs/",
-                         },
-                         );
-    }
-
-    $USERPROP_DEF{'blob_clusterid'} ||= 1;
 
     # random user defaults to a week
     $RANDOM_USER_PERIOD = 7;
diff -r e8fd7995c10e -r c3f4335a9370 doc/raw/build/ljconfig/ljconfig2db.pl
--- a/doc/raw/build/ljconfig/ljconfig2db.pl	Fri Oct 29 13:56:42 2010 +0800
+++ b/doc/raw/build/ljconfig/ljconfig2db.pl	Fri Oct 29 14:09:38 2010 +0800
@@ -420,15 +420,6 @@ my %ljconfig =
 
         'filesystem_related' => {
             'name' => "Filesystem Related",
-            'blobinfo' => {
-                    'desc' => "Hash that contains the details for a number of blob servers. The format of the parameter is 'cluster' => 'directory'. You also need to add a [ljconfig[userprop_def]] key: 'blob_clusterid' => 1,. The webserver user also needs to be able to access the given directory. If you wish to use &captcha;s image / audio generation for human checks, then this is a necessary parameter. <emphasis role='strong'>This is old. &mogfs; is the future</emphasis>. You might want to use this option, though, for development, as blobserver in local-filesystem-mode is easy to set up.",
-                    'type' => "hash",
-                    'example' => '%BLOBINFO = (
-    "clusters" => {
-        "1" => "\$HOME/var/blobs/",
-        },
-    );'
-            },
             'disable_media_uploads' => {
                 'desc' => "Boolean to disable all media uploads/modifications that would go to &mogfs;. This puts code that interacts with &mogfs; into read-only mode: editicons.bml - users can&apos;t delete/upload userpics while in this mode, and &captcha;s - can&apos;t generate new ones or delete old ones while flag on. You might set this if you needed to turn off your &mogfs; install, for example.",
             },
--------------------------------------------------------------------------------