summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Rossouw2010-08-11 17:57:23 +0200
committerAdrian Rossouw2010-08-11 17:57:23 +0200
commit9617c941b4a4103f7d358dfeabadaba1d92b4c9f (patch)
treeefbf13d1ccb5e469ae2c4edab0aa06e78f794f3f
parent1b3d7bc1e8dbff3baef2b9a8d675444505000ea8 (diff)
tag for alpha 10provision-0.4-alpha10
-rw-r--r--aegir.make6
-rw-r--r--docs/INSTALL.txt2
-rw-r--r--docs/UPGRADE.txt2
-rw-r--r--install.sh.txt3
-rw-r--r--platform/install.provision.inc4
5 files changed, 10 insertions, 7 deletions
diff --git a/aegir.make b/aegir.make
index be947a6..ea3ba26 100644
--- a/aegir.make
+++ b/aegir.make
@@ -2,6 +2,6 @@ core = 6.x
projects[] = "drupal"
projects[hostmaster][type] = "profile"
-projects[hostmaster][download][type] = "git"
-projects[hostmaster][download][url] = "git://git.aegirproject.org/hostmaster.git"
-projects[hostmaster][download][branch] = "master"
+projects[hostmaster][download][type] = "get"
+projects[hostmaster][download][url] = "http://files.aegirproject.org/hostmaster-0.4-alpha10.tgz"
+projects[hostmaster][directory_name] = "hostmaster"
diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index 1953c1f..14ec1a7 100644
--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@@ -249,7 +249,7 @@ preparing the backend and frontend install for you. That script needs to be run
as the aegir user created above. This file is available in Provision or can be
downloaded through the web at:
-http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=HEAD
+http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=provision-0.4-alpha10
By default, the install script will install the "correct" version of Aegir
(ie. if it was downloaded through git, it will install the version from the
diff --git a/docs/UPGRADE.txt b/docs/UPGRADE.txt
index 3d98dbe..b662593 100644
--- a/docs/UPGRADE.txt
+++ b/docs/UPGRADE.txt
@@ -35,7 +35,7 @@ you are reading this document.
Shell commands::
- export AEGIR_VERSION=HEAD
+ export AEGIR_VERSION=0.4-alpha10
export DRUPAL_DIR=/var/aegir/hostmaster-$AEGIR_VERSION
export DRUSH_VERSION=6.x-3.3
export DRUSH_MAKE_VERSION=6.x-2.0-beta8
diff --git a/install.sh.txt b/install.sh.txt
index e4ebd09..d35582f 100644
--- a/install.sh.txt
+++ b/install.sh.txt
@@ -30,7 +30,8 @@
#
########################################################################
# basic variables, change before release
-AEGIR_VERSION="HEAD"
+
+AEGIR_VERSION="0.4-alpha10"
DRUSH_VERSION=6.x-3.3
# when adding a variable here, add it to the display below
diff --git a/platform/install.provision.inc b/platform/install.provision.inc
index 29dc5da..17a31b5 100644
--- a/platform/install.provision.inc
+++ b/platform/install.provision.inc
@@ -49,9 +49,11 @@ function drush_provision_drupal_provision_install() {
// Requires at least the database settings to complete.
provision_prepare_environment();
_provision_drupal_create_settings_file();
- drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
+
provision_save_site_data();
+ drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
+
// call a backend task to do the actual installation.
$result = provision_backend_invoke(d()->name, "provision-install-backend");
// pass the login link back to the front end.