X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rt%2Fshare%2Fhtml%2FAdmin%2FTools%2FConfiguration.html;fp=rt%2Fshare%2Fhtml%2FAdmin%2FTools%2FConfiguration.html;h=fea3a5fccaed38c3252f1f9937328c8fbbc29b00;hb=1c538bfabc2cd31f27067505f0c3d1a46cba6ef0;hp=f60cdba6fbf6d3d8d3b2ac154f35b2145b3931f1;hpb=4f5619288413a185e9933088d9dd8c5afbc55dfa;p=freeside.git
diff --git a/rt/share/html/Admin/Tools/Configuration.html b/rt/share/html/Admin/Tools/Configuration.html
index f60cdba6f..fea3a5fcc 100644
--- a/rt/share/html/Admin/Tools/Configuration.html
+++ b/rt/share/html/Admin/Tools/Configuration.html
@@ -87,7 +87,7 @@ foreach my $key ( RT->Config->Options( Overridable => undef, Sorted => 0 ) ) {
<% $key %> |
-% if ( $key =~ /Password(?!Length)/i ) {
+% if ( $key =~ /Password/i and $key !~ /MinimumPasswordLength|AllowLoginPasswordAutoComplete/ ) {
<% loc('Password not printed' ) %>\
% } else {
<% stringify($val) |n %>\
@@ -150,6 +150,7 @@ for my $type (qw/Tickets Queues Transactions Groups PrivilegedUsers Unprivileged
$class =~ s/Privileged|Unprivileged//;
my $collection = $class->new(RT->SystemUser);
$collection->UnLimit;
+ $collection->FindAllRows; # find disabled
if ($type =~ /PrivilegedUsers/) {
$user_count = $collection->CountAll;
$collection->LimitToPrivileged;
@@ -179,6 +180,15 @@ for my $type (qw/Tickets Queues Transactions Groups PrivilegedUsers Unprivileged
&>
+<&|/Widgets/TitleBox, title => loc("Static file search order") &>
+
+% foreach my $path ( (map {$_->{root}} RT->Config->Get('StaticRoots')),
+% RT::Interface::Web->StaticRoots ) {
+- <% $path %>
+% }
+
+&>
+
<&|/Widgets/TitleBox, title => loc("Perl library search order") &>
% foreach my $inc (@INC) {
@@ -187,6 +197,22 @@ for my $type (qw/Tickets Queues Transactions Groups PrivilegedUsers Unprivileged
&>
+<&|/Widgets/TitleBox, title=> loc("Loaded config files") &>
+
+% foreach my $config (RT->Config->LoadedConfigs) {
+% if ($config->{site}) {
+- <% $config->{filename} %>
+% } else {
+- <% $config->{filename} %>
+% }
+% }
+
+&>
+
+<&|/Widgets/TitleBox, title=> loc("Logging summary") &>
+ <& /Admin/Elements/LoggingSummary &>
+&>
+
|
@@ -199,6 +225,7 @@ for my $type (qw/Tickets Queues Transactions Groups PrivilegedUsers Unprivileged
% my $attrs = $RT::System->Attributes;
% my $index_size = 0;
% while ( my $attr = $attrs->Next ) {
+% next if $attr->Name eq 'UpgradeHistory';
% if ($attr->Name eq 'UserLogo') {
% my $content = $attr->Content;
@@ -249,6 +276,10 @@ if ($item =~ /^\s*(.*?)\s*v(\S+);/) {
&>
+<&|/Widgets/TitleBox, title => loc("RT upgrade history")&>
+<& /Admin/Elements/UpgradeHistory &>
+&>
+
<&|/Widgets/TitleBox, title => loc("Perl configuration") &>
% require Config;
@@ -256,6 +287,66 @@ if ($item =~ /^\s*(.*?)\s*v(\S+);/) {
&>
+<&|/Widgets/TitleBox, title=> loc("Environment variables") &>
+
+
+<&|/l&>Variable&> |
+<&|/l&>Value&> |
+
+% my $row = 0;
+% for my $key (sort keys %ENV) {
+
+<% $key %> |
+<% $ENV{$key} %> |
+
+% }
+
+&>
+
+<&|/Widgets/TitleBox, title => loc("Operating System") &>
+
+
+Deployment type |
+<%
+ $INC{'mod_perl.pm'} ? "mod_perl" :
+ $INC{'FCGI.pm'} ? "fastcgi" :
+ "standalone" %>
+ |
+
+<%perl>
+my @os = (
+ "Distribution" => 'lsb_release --all',
+ "uname -a" => 'uname -a',
+ "SELinux status" => 'getenforce',
+ "Apache" => [map { "$_ -V" } qw(apache2ctl apachectl httpdctl)],
+ "nginx" => 'nginx -V 2>&1',
+ "lighttpd" => 'lighttpd -V',
+);
+my @os_info;
+
+while (my ($name, $cmd) = splice @os, 0, 2) {
+ $cmd = [$cmd] unless ref $cmd eq 'ARRAY';
+ for my $run (@$cmd) {
+ $run .= " /dev/null" unless $run =~ /2>/;
+ my $result = `$run`;
+ if (defined $result and $result =~ /\S/) {
+ push @os_info, $name => $result;
+ last;
+ }
+ }
+}
+my $row = 1;
+%perl>
+% while (my ($name, $output) = splice @os_info, 0, 2) {
+">
+<% $name %> |
+<% $output %> |
+
+% }
+
+&>
+
<%INIT>
use Data::Dumper;
local $Data::Dumper::Terse = 1;
@@ -264,7 +355,7 @@ local $Data::Dumper::Indent = 2;
sub stringify {
my $value = shift;
my $output = Dumper $value;
- RT::Interface::Web::EscapeUTF8(\$output);
+ RT::Interface::Web::EscapeHTML(\$output);
$output =~ s/ / /g;
$output =~ s!\n!
!g;
return $output;