summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Beaupré2013-09-28 12:43:43 (GMT)
committerAntoine Beaupré2013-09-28 12:43:43 (GMT)
commit2b41934a0d81469c2947b5e0a6b14c65db333ef9 (patch)
treeae6a5c1272f8c5705984a11908aa0c8c0946cf5e
parent02c29830415c429c9c05d514c5b1036881cb8da9 (diff)
properly detect IP from the frontend, fix warningdev-ssl-ip-allocation-refactor
-rw-r--r--http/Provision/Service/http/ssl.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/http/Provision/Service/http/ssl.php b/http/Provision/Service/http/ssl.php
index 83c3458..637a246 100644
--- a/http/Provision/Service/http/ssl.php
+++ b/http/Provision/Service/http/ssl.php
@@ -48,13 +48,13 @@ class Provision_Service_http_ssl extends Provision_Service_http_public {
if ($config == 'site' && $this->context->ssl_enabled) {
foreach ($this->context->ip_addresses as $server => $ip_address) {
- if ($this->server->name == $server) {
+ if ($this->server->name == '@' . $server) {
$data['ip_address'] = $ip_address;
break;
}
}
- if (!$data['ip_address']) {
- drush_log(dt('no proper IP provided by the frontend for server %servername, using wildcard', array('%servername' => $this->server->name)), 'warning');
+ if (!isset($data['ip_address'])) {
+ drush_log(dt('No proper IP provided by the frontend for server %servername, using wildcard', array('%servername' => $this->server->name)), 'warning');
$data['ip_address'] = '*';
}
if ($this->context->ssl_enabled == 2) {