also support regexp in domain_suffix

2019-09-03 13:35:26 +01:00
parent 0a2b5c8fa2
commit 975e4c6afc
2 changed files with 4 additions and 3 deletions
--- a/lib/App/Netdisco/Configuration.pm
+++ b/lib/App/Netdisco/Configuration.pm
@@ -141,7 +141,8 @@ config->{'domain_suffix'} = [setting('domain_suffix')]
  if ref [] ne ref setting('domain_suffix');

 if (scalar @{ setting('domain_suffix') }) {
-  my @suffixes = map { quotemeta } @{ setting('domain_suffix') };
+  my @suffixes = map { (ref qr// eq ref $_) ? $_ : quotemeta }
+                    @{ setting('domain_suffix') };
  my $buildref = '(?:'. (join '|', @suffixes) .')$';
  config->{'domain_suffix'} = qr/$buildref/;
 }