Bug 351243: Public webdot server changed its IP address

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=colin, a=justdave

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 93d8d8d2c12272bb92dd2a6824704c0b2fca2e3f..4ce2cbc0958722aac9992addbeeaf01e7cdb4d76 100644 (file)
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -380,7 +380,7 @@ sub bz_locations {
         # change showdependencygraph.cgi to set image_url to the correct 
         # location.
         # The script should really generate these graphs directly...
-        'webdotdir'   => "$libpath/$datadir/webdot",
+        'webdotdir'   => "$datadir/webdot",
         'extensionsdir' => "$libpath/extensions",
     };
 }

diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index cb2800dd73f8c1d24343eab67a1b01e99a7c6af9..c9c090bb046a6bf247bacb7d09d32a2e94579faa 100644 (file)
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -257,7 +257,7 @@ EOT
 # if research.att.com ever changes their IP, or if you use a different
 # webdot server, you'll need to edit this
 <FilesMatch \\.dot\$>
-  Allow from 192.20.225.10
+  Allow from 192.20.225.0/24
   Deny from all
 </FilesMatch>
 
@@ -385,6 +385,22 @@ sub create_htaccess {
         print $htaccess $old_data;
         $htaccess->close;
     }
+
+
+    my $webdot_dir = bz_locations()->{'webdotdir'};
+    # The public webdot IP address changed.
+    my $webdot = new IO::File("$webdot_dir/.htaccess", 'r')
+        || die "$webdot_dir/.htaccess: $!";
+    my $webdot_data;
+    { local $/; $webdot_data = <$webdot>; }
+    $webdot->close;
+    if ($webdot_data =~ /192\.20\.225\.10/) {
+        print "Repairing $webdot_dir/.htaccess...\n";
+        $webdot_data =~ s/192\.20\.225\.10/192.20.225.0\/24/g;
+        $webdot = new IO::File("$webdot_dir/.htaccess", 'w') || die $!;
+        print $webdot $webdot_data;
+        $webdot->close;
+    }
 }
 
 # A helper for the above functions.