diff options
author | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 21:11:29 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 21:11:29 -0700 |
commit | 3d0a1bb06b895c5be6e3f0517d355442a6b1e125 (patch) | |
tree | 84069ebc3254825b952a482e11cdbbbc69f6fe85 /rt/lib/RT/Installer.pm | |
parent | f3b99c11d6eed33f467dda360180a698a85c54e8 (diff) | |
parent | d62206a94d9d49ef96640e0a8ec492679f8345e9 (diff) |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/lib/RT/Installer.pm')
-rw-r--r-- | rt/lib/RT/Installer.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rt/lib/RT/Installer.pm b/rt/lib/RT/Installer.pm index d12abb678..d876e10aa 100644 --- a/rt/lib/RT/Installer.pm +++ b/rt/lib/RT/Installer.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -97,6 +97,7 @@ my %Meta = ( }, }, DatabaseAdmin => { + SkipWrite => 1, Widget => '/Widgets/Form/String', WidgetArguments => { Default => 1, @@ -106,6 +107,7 @@ my %Meta = ( }, }, DatabaseAdminPassword => { + SkipWrite => 1, Widget => '/Widgets/Form/String', WidgetArguments => { Description => 'DBA password', #loc @@ -149,6 +151,7 @@ my %Meta = ( }, }, Password => { + SkipWrite => 1, Widget => '/Widgets/Form/String', WidgetArguments => { Description => 'Administrative password', #loc @@ -274,10 +277,10 @@ sub SaveConfig { $RT::Installer->{InstallConfig}{rtname}; if ( open my $fh, '>', $file ) { - for ( keys %{ $RT::Installer->{InstallConfig} } ) { + for ( sort keys %{ $RT::Installer->{InstallConfig} } ) { # we don't want to store root's password in config. - next if $_ eq 'Password'; + next if $class->Meta($_) and $class->Meta($_)->{SkipWrite}; $RT::Installer->{InstallConfig}{$_} = '' unless defined $RT::Installer->{InstallConfig}{$_}; |