use Sys::Hostname::hostname instead of hostname --fqdn

[debbugs.git] / Debbugs / Config.pm

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index f076585a21dd80d1c205deb83561025279264367..f70860452e042af31667570c5ccb3aa418044314 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -78,7 +78,7 @@ BEGIN {
                                ],
                     text     => [qw($gBadEmailPrefix $gHTMLTail $gHTMLExpireNote),
                                 ],
                                ],
                     text     => [qw($gBadEmailPrefix $gHTMLTail $gHTMLExpireNote),
                                 ],

-                     cgi => [qw($gLibravatarUri $gLibravatarUriOptions)],
+                     cgi => [qw($gLibravatarUri $gLibravatarCacheDir $gLibravatarUriOptions @gLibravatarBlacklist)],

                     config   => [qw(%config)],
                    );
      @EXPORT_OK = ();
                     config   => [qw(%config)],
                    );
      @EXPORT_OK = ();


@@ -87,6 +87,7 @@ BEGIN {
      $ENV{HOME} = '' if not defined $ENV{HOME};
 }
 
      $ENV{HOME} = '' if not defined $ENV{HOME};
 }
 

+use Sys::Hostname;

 use File::Basename qw(dirname);
 use IO::File;
 use Safe;
 use File::Basename qw(dirname);
 use IO::File;
 use Safe;


@@ -298,18 +299,13 @@ set_default(\%config,'unknown_maintainer_email',$config{maintainer_email});
 The name of the machine that this instance of debbugs is running on
 (currently used for debbuging purposes and web page output.)
 
 The name of the machine that this instance of debbugs is running on
 (currently used for debbuging purposes and web page output.)
 

-Default: qx(hostname --fqdn)
+Default: Sys::Hostname::hostname()

 
 =back
 
 =cut
 
 
 =back
 
 =cut
 

-my $_old_path = $ENV{PATH};
-$ENV{PATH} = '/bin:/usr/bin:/usr/local/bin';
-my $temp_hostname = qx(hostname --fqdn);
-chomp $temp_hostname;
-set_default(\%config,'machine_name',$temp_hostname);
-$ENV{PATH} = $_old_path;
+set_default(\%config,'machine_name',Sys::Hostname::hostname());

 
 =head2 BTS Mailing Lists
 
 
 =head2 BTS Mailing Lists
 


@@ -979,7 +975,7 @@ libravatar.cgi, our internal federated libravatar system.
 
 =cut
 
 
 =cut
 

-set_default(\%config,'libravatar_uri',$config{cgi_domain}.'/libravatar.cgi?email=');
+set_default(\%config,'libravatar_uri','http://'.$config{cgi_domain}.'/libravatar.cgi?email=');

 
 =item libravatar_uri_options $gLibravatarUriOptions
 
 
 =item libravatar_uri_options $gLibravatarUriOptions
 


@@ -1017,6 +1013,17 @@ Default: $config{web_dir}/libravatar/
 
 set_default(\%config,'libravatar_cache_dir',$config{web_dir}.'/libravatar/');
 
 
 set_default(\%config,'libravatar_cache_dir',$config{web_dir}.'/libravatar/');
 

+=item libravatar_blacklist
+
+Array of regular expressions to match against emails, domains, or
+images to only show the default image
+
+Default: empty array
+
+=cut
+
+set_default(\%config,'libravatar_blacklist',[]);
+

 =back
 
 =head2 Text Fields
 =back
 
 =head2 Text Fields