Commit 875d9422 authored by anarcat's avatar anarcat Committed by anarcat

Merge branch 'master' into dev-dns

parents 6bdad7c3 039f9668
# Aegir web server configuration file
<?php foreach ($server->ip_addresses as $ip) : ?>
NameVirtualHost <?php print $ip . ':' . $http_port; ?>
NameVirtualHost *:<?php print $http_port; ?>
<?php endforeach; ?>
<VirtualHost <?php print $ip_address . ':' . $http_port; ?>>
<VirtualHost *:<?php print $http_port; ?>>
ServerName default
Redirect 404 /
</VirtualHost>
......
......@@ -72,7 +72,7 @@ AEGIR_HOME="$HOME"
AEGIR_HOST=`uname -n`
DRUSH="$AEGIR_HOME/drush/drush.php"
msg "Aegir automated install script"
msg "Aegir $AEGIR_VERSION automated install script"
if [ `whoami` = "root" ] ; then
msg "This script should be ran as a non-root user"
......
......@@ -45,6 +45,10 @@ function drush_provision_drupal_provision_clone($new_uri, $platform = null) {
$options['aliases'] = array();
$options['redirection'] = 0;
if ($profile = drush_get_option('profile', FALSE)) {
$options['profile'] = $profile;
}
if ($db_server = drush_get_option('new_db_server', FALSE)) {
$options['db_server'] = $db_server;
}
......
......@@ -72,6 +72,10 @@ function drush_provision_drupal_provision_migrate($platform, $new_uri = null) {
$options['platform'] = $platform;
$options['root'] = d($platform)->root;
if ($profile = drush_get_option('profile', FALSE)) {
$options['profile'] = $profile;
}
if ($db_server = drush_get_option('new_db_server', FALSE)) {
$options['db_server'] = $db_server;
}
......
......@@ -26,6 +26,8 @@
$profile = "<?php print $this->profile ?>";
$install_profile = "<?php print $this->profile ?>";
/**
* PHP settings:
*
......
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