[dw-free] Oops, not all hostnames are FQDNs.

[mark]

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

Oops, not all hostnames are FQDNs.

Patch by mark.

Files modified:

• bin/worker-manager
• htdocs/misc/import.bml

--------------------------------------------------------------------------------
diff -r df6817c04b7c -r a8a0853bdb0c bin/worker-manager
--- a/bin/worker-manager	Sun Apr 12 06:33:41 2009 +0000
+++ b/bin/worker-manager	Sun Apr 12 07:15:59 2009 +0000
@@ -46,7 +46,7 @@ sub load_config {
         or die "Unable to read YAML formatted config: $fn\n";
 
     my $hostname = `hostname`;
-    $hostname =~ s/^([^.]+)\..+\r?\n$/$1/;
+    $hostname =~ s/^([^.]+)(?:\..+)?\r?\n$/$1/;
     die "Unable to get current hostname\n"
         unless $hostname;
 
diff -r df6817c04b7c -r a8a0853bdb0c htdocs/misc/import.bml
--- a/htdocs/misc/import.bml	Sun Apr 12 06:33:41 2009 +0000
+++ b/htdocs/misc/import.bml	Sun Apr 12 07:15:59 2009 +0000
@@ -155,7 +155,7 @@ body<=
 
 <table>
     <tr><td>Username:</td><td><input type='text' name='username' maxlength='15'></td></tr>
-    <tr><td>Password:</td><td><input type='password' name='password' maxlength='25'></td></tr>
+    <tr><td>Password:</td><td><input type='password' name='password' maxlength='50'></td></tr>
     <tr><td></td><td>
         <select name='hostname'>
             <option value='livejournal.com'>LiveJournal.com</option>
--------------------------------------------------------------------------------