platform/provision_drupal.drush.inc | 20 +++++++++++--------- platform/verify.provision.inc | 1 + web_server/provision_apache_vhost.tpl.php | 6 ++++++ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git platform/provision_drupal.drush.inc platform/provision_drupal.drush.inc index b43deb9..261f2c9 100644 --- platform/provision_drupal.drush.inc +++ platform/provision_drupal.drush.inc @@ -357,15 +357,17 @@ function _provision_drupal_maintain_aliases($url) { // First we delete all the old aliases _provision_drupal_delete_aliases(drush_get_option('aliases', array(), 'site')); - $aliases = drush_get_option('aliases'); - if (!is_array($aliases)) { - $aliases = explode(",", $aliases); - } - foreach($aliases as $alias) { - if (trim($alias)) { - provision_path("symlink", $url, drush_get_option('docroot_path') . "/sites/" . $alias, - dt("Created symlink for alias @alias", array("@alias" => $alias)), - dt("Could not create symlink for alias @alias", array("@alias" => $alias))); + if (!drush_get_option('redirection')) { + $aliases = drush_get_option('aliases'); + if (!is_array($aliases)) { + $aliases = explode(",", $aliases); + } + foreach($aliases as $alias) { + if (trim($alias)) { + provision_path("symlink", $url, drush_get_option('docroot_path') . "/sites/" . $alias, + dt("Created symlink for alias @alias", array("@alias" => $alias)), + dt("Could not create symlink for alias @alias", array("@alias" => $alias))); + } } } } diff --git platform/verify.provision.inc platform/verify.provision.inc index 7a04453..b1eb732 100644 --- platform/verify.provision.inc +++ platform/verify.provision.inc @@ -49,6 +49,7 @@ function drush_provision_drupal_post_provision_verify($url = NULL) { if (PROVISION_CONTEXT_SITE) { _provision_drupal_rebuild_caches($url); drush_set_option('aliases', drush_get_option('aliases'), 'site'); + drush_set_option('redirection', drush_get_option('redirection'), 'site'); drush_set_option('installed', TRUE, 'site'); } } diff --git web_server/provision_apache_vhost.tpl.php web_server/provision_apache_vhost.tpl.php index 0f1e64c..9ce9667 100644 --- web_server/provision_apache_vhost.tpl.php +++ web_server/provision_apache_vhost.tpl.php @@ -14,6 +14,12 @@ + RewriteCond ${HTTP_HOST} !^$ [NC] + RewriteRule ^/*(.*)$ http:///$1 [L,R=301] +