Commit 9c74c16b authored by omega8cc's avatar omega8cc

Issue #2731605 by gboudrias - Hardcoded hosting_le code limits behavior with...

Issue #2731605 by gboudrias - Hardcoded hosting_le code limits behavior with regards to the .well-known directory
parent 7bff65d2
......@@ -13,8 +13,6 @@ if (!$aegir_root && $server->aegir_root) {
}
?>
Alias /.well-known/acme-challenge <?php print $aegir_root; ?>/tools/le/.acme-challenges
DocumentRoot <?php print $this->root; ?>
ServerName <?php print $this->uri; ?>
......@@ -98,11 +96,6 @@ if ($this->redirection) {
</IfModule>
</Directory>
# Allow access to hosting_le challenges directory.
<Directory "<?php print $aegir_root; ?>/tools/le/.acme-challenges">
Require all granted
</Directory>
</VirtualHost>
<?php endif; ?>
......
......@@ -5,7 +5,6 @@ if (!$aegir_root && $server->aegir_root) {
}
?>
Alias /<?php print $subdir; ?>/.well-known/acme-challenge <?php print $aegir_root; ?>/tools/le/.acme-challenges
Alias /<?php print $subdir; ?> <?php print $this->root; ?>
<Location /<?php print $subdir; ?>>
......@@ -46,8 +45,3 @@ Alias /<?php print $subdir; ?> <?php print $this->root; ?>
Options None
Options +FollowSymLinks
</Directory>
# Allow access to hosting_le challenges directory.
<Directory "<?php print $aegir_root; ?>/tools/le/.acme-challenges">
Require all granted
</Directory>
......@@ -10,8 +10,6 @@ if (!$aegir_root && $server->aegir_root) {
}
?>
Alias /.well-known/acme-challenge <?php print $aegir_root; ?>/tools/le/.acme-challenges
DocumentRoot <?php print $this->root; ?>
ServerName <?php print $this->uri; ?>
......@@ -95,11 +93,6 @@ if ($this->redirection || $ssl_redirection) {
</IfModule>
</Directory>
# Allow access to hosting_le challenges directory.
<Directory "<?php print $aegir_root; ?>/tools/le/.acme-challenges">
Require all granted
</Directory>
<?php
$if_subsite = $this->data['http_subdird_path'] . '/' . $this->uri;
if (provision_hosting_feature_enabled('subdirs') && provision_file()->exists($if_subsite)->status()) {
......
......@@ -106,14 +106,6 @@ if ($is_denied) {
add_header X-Frame-Options SAMEORIGIN;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
###
### Support for letsencrypt.org per https://tools.ietf.org/html/rfc5785.
###
location ^~ /.well-known/acme-challenge {
alias <?php print $aegir_root; ?>/tools/le/.acme-challenges;
try_files $uri 404;
}
<?php endif; ?>
<?php if ($satellite_mode == 'boa'): ?>
......
......@@ -190,14 +190,6 @@ location ^~ /<?php print $subdir; ?> {
add_header X-Frame-Options SAMEORIGIN;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
###
### Support for letsencrypt.org per https://tools.ietf.org/html/rfc5785.
###
location ^~ /<?php print $subdir; ?>/.well-known/acme-challenge {
alias <?php print $aegir_root; ?>/tools/le/.acme-challenges;
try_files $uri 404;
}
<?php endif; ?>
###
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment