[Rt-commit] r13026 - in rt/branches/3.8-TESTING: etc share/html/Install

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sat Jun  7 10:30:03 2008
New Revision: 13026

Modified:
   rt/branches/3.8-TESTING/etc/RT_Config.pm.in
   rt/branches/3.8-TESTING/lib/RT/Installer.pm
   rt/branches/3.8-TESTING/share/html/Install/Basics.html

Log:
added domain and port configs in web installer

Modified: rt/branches/3.8-TESTING/etc/RT_Config.pm.in
==============================================================================
--- rt/branches/3.8-TESTING/etc/RT_Config.pm.in	(original)
+++ rt/branches/3.8-TESTING/etc/RT_Config.pm.in	Sat Jun  7 10:30:03 2008
@@ -437,10 +437,13 @@
 
 Set($WebPort, 80);# + ($< * 7274) % 32766 + ($< && 1024));
 
+# you know what domain name is, right? ;)
+Set( $WebDomain, 'localhost' );
+
 # This is the Scheme, server and port for constructing urls to webrt
 # $WebBaseURL doesn't need a trailing /
 
-Set($WebBaseURL, "http://localhost:". RT->Config->Get('WebPort'));
+Set($WebBaseURL, 'http://' . RT->Config->Get('WebDomain') . ':' . RT->Config->Get('WebPort'));
 
 Set($WebURL, RT->Config->Get('WebBaseURL') . RT->Config->Get('WebPath') . "/");
 

Modified: rt/branches/3.8-TESTING/lib/RT/Installer.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Installer.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Installer.pm	Sat Jun  7 10:30:03 2008
@@ -189,6 +189,18 @@
             Description => 'Sendmail path',                  #loc
         },
     },
+    WebDomain => {
+        Widget          => '/Widgets/Form/String',
+        WidgetArguments => {
+            Description => 'domain name',                  #loc
+        },
+    },
+    WebPort => {
+        Widget          => '/Widgets/Form/Integer',
+        WidgetArguments => {
+            Description => 'web port',                  #loc
+        },
+    },
 
 );
 

Modified: rt/branches/3.8-TESTING/share/html/Install/Basics.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Install/Basics.html	(original)
+++ rt/branches/3.8-TESTING/share/html/Install/Basics.html	Sat Jun  7 10:30:03 2008
@@ -63,7 +63,8 @@
 <%init>
 my @results;
 
-my @Types = qw/rtname Organization MinimumPasswordLength Timezone/;
+my @Types = qw/rtname Organization MinimumPasswordLength Timezone
+WebDomain WebPort/;
 
 if ( $Run ) {