summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2018-04-12 14:12:02 (GMT)
committerHerman van Rink2018-04-12 14:12:15 (GMT)
commit818f0721ae5a398fb3fcbde4c65126ffa70feb85 (patch)
tree1e42822fa0eecfe0f708dc619223f6a596279fee
parent6eb49a8f026fb731152b0fdb52b6ee38d5c10bcf (diff)
Issue #2957156: Update links2957156-composer-loader
-rw-r--r--composer.json7
-rw-r--r--http/Provision/Config/Apache/vhost.tpl.php4
2 files changed, 7 insertions, 4 deletions
diff --git a/composer.json b/composer.json
index 47cbe78..1d44619 100644
--- a/composer.json
+++ b/composer.json
@@ -5,14 +5,13 @@
"license": "GPL-2.0-or-later",
"authors": [
{
- "name": "Drupal Console Contributors",
- "homepage": "https://github.com/hechoendrupal/drupal-console/graphs/contributors"
+ "name": "Aegir maintainers",
+ "homepage": "http://docs.aegirproject.org/en/3.x/community/core-team/"
}
],
"support": {
"issues": "https://www.drupal.org/project/issues/provision",
- "forum": "https://gitter.im/hechoendrupal/DrupalConsole",
- "docs": "https://docs.drupalconsole.com/"
+ "docs": "http://docs.aegirproject.org/"
},
"require": {},
"config": {
diff --git a/http/Provision/Config/Apache/vhost.tpl.php b/http/Provision/Config/Apache/vhost.tpl.php
index e724bd7..c0ea51c 100644
--- a/http/Provision/Config/Apache/vhost.tpl.php
+++ b/http/Provision/Config/Apache/vhost.tpl.php
@@ -42,10 +42,14 @@ if ($this->redirection || $ssl_redirection) {
if ($ssl_redirection && !$this->redirection) {
print " # Redirect aliases in non-ssl to the same alias on ssl.\n";
+ print " # Except for /.well-known/acme-challenge/ to prevent potential problems with Let's Encrypt\n";
+ print " RewriteCond %{REQUEST_URI} '!/.well-known/acme-challenge/'\n";
print " RewriteRule ^/*(.*)$ https://%{HTTP_HOST}/$1 [NE,L,R=301]\n";
}
elseif ($ssl_redirection && $this->redirection) {
print " # Redirect all aliases + main uri to the main https uri.\n";
+ print " # Except for /.well-known/acme-challenge/ to prevent potential problems with Let's Encrypt\n";
+ print " RewriteCond %{REQUEST_URI} '!/.well-known/acme-challenge/'\n";
print " RewriteRule ^/*(.*)$ https://{$this->uri}/$1 [NE,L,R=301]\n";
}
elseif (!$ssl_redirection && $this->redirection) {