[Rt-commit] r13398 - in rt/3.8/branches/3.8.0-releng: lib/RT share/html/Install
jesse at bestpractical.com
jesse at bestpractical.com
Wed Jun 18 17:04:35 EDT 2008
Author: jesse
Date: Wed Jun 18 17:04:34 2008
New Revision: 13398
Modified:
rt/3.8/branches/3.8.0-releng/ (props changed)
rt/3.8/branches/3.8.0-releng/Makefile.in
rt/3.8/branches/3.8.0-releng/lib/RT/Installer.pm
rt/3.8/branches/3.8.0-releng/share/html/Install/DatabaseType.html
Log:
r33053 at 31b: jesse | 2008-06-17 18:14:41 -0400
* install working fixes
Modified: rt/3.8/branches/3.8.0-releng/Makefile.in
==============================================================================
--- rt/3.8/branches/3.8.0-releng/Makefile.in (original)
+++ rt/3.8/branches/3.8.0-releng/Makefile.in Wed Jun 18 17:04:34 2008
@@ -377,21 +377,19 @@
# {{{ database-installation
regression-reset-db: force-dropdb
- $(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
+ $(PERL) sbin/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
initdb :: initialize-database
initialize-database:
- $(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
+ $(PERL) sbin/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
dropdb:
- $(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
+ $(PERL) sbin/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
force-dropdb:
- $(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --dba-password '' --force
+ $(PERL) sbin/rt-setup-database --action drop --dba $(DB_DBA) --dba-password '' --force
-insert-approval-data:
- $(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/insert_approval_scrips
# }}}
# {{{ libs-install
Modified: rt/3.8/branches/3.8.0-releng/lib/RT/Installer.pm
==============================================================================
--- rt/3.8/branches/3.8.0-releng/lib/RT/Installer.pm (original)
+++ rt/3.8/branches/3.8.0-releng/lib/RT/Installer.pm Wed Jun 18 17:04:34 2008
@@ -74,16 +74,18 @@
Widget => '/Widgets/Form/String',
WidgetArguments => {
Description => 'Database host',
- Hints => "The domain name of your database server (like 'db.int.example.com')", #loc
+ Default => 1,
+ DefaultLabel => "Keep 'localhost' if you're not sure", #loc
+ Hints => "The domain name of your database server (like 'db.example.com').", #loc
},
},
DatabasePort => {
Widget => '/Widgets/Form/Integer',
WidgetArguments => {
- Description => 'Database port number', #loc
+ Description => 'Database port', #loc
Default => 1,
DefaultLabel =>
- 'Leave empty to use default value of the RDBMS', #loc
+ 'Leave empty to use a default value', #loc
},
},
DatabaseName => {
@@ -95,8 +97,9 @@
DatabaseAdmin => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
- Description => 'DBA of the database', #loc
- Hints => "The database username of the administrator",
+ Default => 1,
+ DefaultLabel => "Leave this alone to use a default value",
+ Description => 'DBA username', # loc
},
},
DatabaseAdminPassword => {
@@ -104,7 +107,7 @@
WidgetArguments => {
Description =>
'DBA password', #loc
- Hints => "The database password of the administrator",
+ Hints => "The DBA's database password",#loc
Type => 'password',
},
},
@@ -112,16 +115,16 @@
Widget => '/Widgets/Form/String',
WidgetArguments => {
Description =>
- 'Database username for RT', #loc
+ 'RT database username', #loc
},
},
DatabasePassword => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
Description =>
- 'Database password for RT', #loc
+ 'RT database password', #loc
Type => 'password',
- Hints => 'default is rt_pass',
+ Hints => 'The default password is "rt_pass"',
},
},
DatabaseRequireSSL => {
@@ -133,7 +136,8 @@
rtname => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
- Description => 'RT Name', #loc
+ Description => 'Site name', #loc
+ Hints => 'Set this to your internet domain. (ex: example.com)' #loc
},
},
Organization => {
@@ -151,7 +155,8 @@
Password => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
- Description => 'password of the user root in RT', #loc
+ Description => 'Administrative password', #loc
+ Hints => 'RT will create a user called "root" and set this as their password', #loc
Type => 'password',
},
},
@@ -164,8 +169,8 @@
OwnerEmail => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
- Description => 'Owner email', #loc
- Hints => 'the address of a human who manages RT.',
+ Description => 'RT Administrator', #loc
+ Hints => 'The email address of a human who manages RT.',
},
},
CommentAddress => {
Modified: rt/3.8/branches/3.8.0-releng/share/html/Install/DatabaseType.html
==============================================================================
--- rt/3.8/branches/3.8.0-releng/share/html/Install/DatabaseType.html (original)
+++ rt/3.8/branches/3.8.0-releng/share/html/Install/DatabaseType.html Wed Jun 18 17:04:34 2008
@@ -51,8 +51,8 @@
<form method="post">
<p>RT works just great with a number of different databases. <b>MySQL</b>, <b>PostgreSQL</b>, <b>Oracle</b> and <b>SQLite</b> are all supported.</p>
- <p>You should choose whichever database you or your local database administrator is most comfortable with.</p>
- <p><b>SQLite is a database that doesn't need a server or any configuration whatsoever. RT's authors recommend it for testing, demoing and development, but it's not quite right for a high-volume production RT server.</b></p>
+ <p>You should choose the database you or your local database administrator is most comfortable with.</p>
+ <p><i>SQLite is a simple database that doesn't need a server or any configuration whatsoever. RT's authors recommend it for testing, demoing and development, but <b>it's not quite right for a high-volume production RT server</b>.</i></p>
<p>If your supported database isn't listed in the dropdown below, that means RT couldn't find a <i>database driver</i> for it installed locally. You may be able to remedy this by using <a href="http://search.cpan.org" target="_new">CPAN</a> to download and install DBD::MySQL, DBD::Oracle or DBD::Pg.</p>
<& /Widgets/BulkEdit, Types => \@Types, Meta => $RT::Installer->{Meta},
More information about the Rt-commit
mailing list