Possibility to explicitely disable Self hosts

9 years ago · 88a7d5fda0
parent ebdeabf799
commit 88a7d5fda0
1 changed files with 2 additions and 2 deletions
--- a/root/etc/e-smith/templates/etc/letsencrypt.sh/domains.txt/10domains
+++ b/root/etc/e-smith/templates/etc/letsencrypt.sh/domains.txt/10domains
@ -21,9 +21,9 @@ foreach my $host ($h->hosts){
    $dom = $1;
  }
  my $type = $host->prop('HostType') || 'Self';
-  my $le = $host->prop('Letsencrypt') || 'disabled';
+  my $le = $host->prop('Letsencrypt') || 'default';
  if ($le =~ m/^enabled|yes|1|on$/i ||
-      $type eq 'Self' && $dom eq $DomainName){
+      ($type eq 'Self' && $dom eq $DomainName) && ($le !~ m/^disabled|no|0|off$/)){
    push @names, $host->key;
  }
 }