diff options
Diffstat (limited to 'rt/share/html/Install')
-rw-r--r-- | rt/share/html/Install/DatabaseDetails.html | 4 | ||||
-rw-r--r-- | rt/share/html/Install/DatabaseType.html | 2 | ||||
-rw-r--r-- | rt/share/html/Install/Finish.html | 4 | ||||
-rw-r--r-- | rt/share/html/Install/Global.html | 1 | ||||
-rw-r--r-- | rt/share/html/Install/Initialize.html | 1 | ||||
-rw-r--r-- | rt/share/html/Install/index.html | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/rt/share/html/Install/DatabaseDetails.html b/rt/share/html/Install/DatabaseDetails.html index b79793e85..b64cc5ad6 100644 --- a/rt/share/html/Install/DatabaseDetails.html +++ b/rt/share/html/Install/DatabaseDetails.html @@ -105,9 +105,6 @@ unless ( $db_type eq 'SQLite' ) { push @Types, 'DatabaseHost', 'DatabasePort', 'DatabaseAdmin', 'DatabaseAdminPassword', 'DatabaseUser', 'DatabasePassword'; } -if ( $db_type eq 'Pg' ) { - push @Types, 'DatabaseRequireSSL'; -} if ( $Run ) { @@ -129,7 +126,6 @@ if ( $Run ) { my ( $status, $msg ) = RT::Installer->SaveConfig; if ( $status ) { - delete $INC{'RT_SiteConfig.pm'}; RT->LoadConfig; RT::Handle->FinalizeDatabaseType(); # dba connect systemdsn diff --git a/rt/share/html/Install/DatabaseType.html b/rt/share/html/Install/DatabaseType.html index 40616a93e..09d31d660 100644 --- a/rt/share/html/Install/DatabaseType.html +++ b/rt/share/html/Install/DatabaseType.html @@ -58,7 +58,7 @@ <&|/l&>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> -<&|/l_unsafe, '<a href="http://search.cpan.org" target="_new">CPAN</a>' &>If your preferred 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 [_1] to download and install DBD::MySQL, DBD::Oracle or DBD::Pg.</&> +<&|/l_unsafe, '<a href="http://search.cpan.org" target="_blank">CPAN</a>' &>If your preferred 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 [_1] to download and install DBD::MySQL, DBD::Oracle or DBD::Pg.</&> </p> </div> diff --git a/rt/share/html/Install/Finish.html b/rt/share/html/Install/Finish.html index 28307badd..8f9ef47e9 100644 --- a/rt/share/html/Install/Finish.html +++ b/rt/share/html/Install/Finish.html @@ -79,9 +79,11 @@ if ( $Run ) { RT->InitClasses(); RT->InitPlugins(); - system( 'chmod -w ' . RT::Installer->ConfigFile ) && + my $ret = chmod 0440, RT::Installer->ConfigFile; + if ( !$ret ) { $RT::Logger->error( 'failed to make ' . RT::Installer->ConfigFile . ' readonly' ); + } my $root = RT::User->new( RT->SystemUser ); $root->Load('root'); my ($ok, $val) = $root->SetPassword( $RT::Installer->{InstallConfig}{Password} ); diff --git a/rt/share/html/Install/Global.html b/rt/share/html/Install/Global.html index 593efdc79..81058904d 100644 --- a/rt/share/html/Install/Global.html +++ b/rt/share/html/Install/Global.html @@ -94,7 +94,6 @@ if ( $Run ) { my ( $status, $msg ) = RT::Installer->SaveConfig; if ( $status ) { - delete $INC{'RT_SiteConfig.pm'}; RT->LoadConfig; if ( $RT::Installer->{DatabaseAction} ne 'none' ) { diff --git a/rt/share/html/Install/Initialize.html b/rt/share/html/Install/Initialize.html index 8dbefccc5..2c22509b1 100644 --- a/rt/share/html/Install/Initialize.html +++ b/rt/share/html/Install/Initialize.html @@ -119,6 +119,7 @@ if ( $Run ) { $RT::Handle->dbh( undef ); RT::ConnectToDatabase(); RT::InitLogging(); + RT::InitClasses(); ($status, $msg) = $RT::Handle->InsertInitialData; } elsif ( $action eq 'insert' ) { diff --git a/rt/share/html/Install/index.html b/rt/share/html/Install/index.html index 21fb3ebac..f4d951827 100644 --- a/rt/share/html/Install/index.html +++ b/rt/share/html/Install/index.html @@ -110,7 +110,7 @@ elsif ( $Run ) { $RT::Installer->{InstallConfig} ||= {}; for my $field ( qw/DatabaseType DatabaseName DatabaseHost DatabasePort - DatabaseUser DatabaseRequireSSL rtname + DatabaseUser rtname Organization CommentAddress CorrespondAddress SendmailPath WebDomain WebPort/ ) { |