X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rt%2Fshare%2Fhtml%2FInstall%2FFinish.html;h=eb16116d500c556878ad6ce62bc18f94aeb4df7d;hb=7322f2afedcc2f427e997d1535a503613a83f088;hp=2ce97c42ab3755fd07b41a1f23d21e3bbf65c5cc;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd;p=freeside.git

diff --git a/rt/share/html/Install/Finish.html b/rt/share/html/Install/Finish.html
index 2ce97c42a..eb16116d5 100644
--- a/rt/share/html/Install/Finish.html
+++ b/rt/share/html/Install/Finish.html
@@ -1,40 +1,40 @@
 %# BEGIN BPS TAGGED BLOCK {{{
-%# 
+%#
 %# COPYRIGHT:
-%# 
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%#                                          <jesse@bestpractical.com>
-%# 
+%#
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
+%#                                          <sales@bestpractical.com>
+%#
 %# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
+%#
+%#
 %# LICENSE:
-%# 
+%#
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
 %# been provided with this software, but in any event can be snarfed
 %# from www.gnu.org.
-%# 
+%#
 %# This work is distributed in the hope that it will be useful, but
 %# WITHOUT ANY WARRANTY; without even the implied warranty of
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
-%# 
+%#
 %# You should have received a copy of the GNU General Public License
 %# along with this program; if not, write to the Free Software
 %# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 %# 02110-1301 or visit their web page on the internet at
 %# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%# 
-%# 
+%#
+%#
 %# CONTRIBUTION SUBMISSION POLICY:
-%# 
+%#
 %# (The following paragraph is not intended to limit the rights granted
 %# to you to modify and distribute this software under the terms of
 %# the GNU General Public License and is only of importance to you if
 %# you choose to contribute your changes and enhancements to the
 %# community by submitting them to Best Practical Solutions, LLC.)
-%# 
+%#
 %# By intentionally submitting any modifications, corrections or
 %# derivatives to this work, or any other work intended for use with
 %# Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -43,7 +43,7 @@
 %# royalty-free, perpetual, license to use, copy, create derivative
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
-%# 
+%#
 %# END BPS TAGGED BLOCK }}}
 <&| Elements/Wrapper, Title => loc('Step [_1] of [_2]', 7, 7) .': '. loc('Finish') &> 
 
@@ -53,11 +53,11 @@
 </p>
 
 <p>
-<&|/l&>You should be taken directly to a login page. You'll be able to log in with username of <tt>root</tt> and the password you set earlier.</&>
+<&|/l_unsafe, '<tt>root</tt>' &>You should be taken directly to a login page. You'll be able to log in with username of [_1] and the password you set earlier.</&>
 </p>
 
 <p>
-<&|/l&>If you've change the Port that RT runs on, you'll need to restart the server in order to log in.</&>
+<&|/l&>If you've changed the Port that RT runs on, you'll need to restart the server in order to log in.</&>
 </p>
 
 <p>
@@ -79,12 +79,15 @@ 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 );
+    }
+    my $root = RT::User->new( RT->SystemUser );
     $root->Load('root');
-    $root->SetPassword( $RT::Installer->{InstallConfig}{Password} );
+    my ($ok, $val) = $root->SetPassword( $RT::Installer->{InstallConfig}{Password} );
+    $RT::Logger->warning("Unable to set root password: $val") if !$ok;
 
     RT::Interface::Web::Redirect(RT->Config->Get('WebURL'));
 }