summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Jacq2010-12-22 04:18:38 (GMT)
committermig52010-12-22 04:18:38 (GMT)
commit168971a83bf15bdc8ebe26a5b132f8b486eb665d (patch)
tree01fb4c89048d814faa8a12ff864d91d02df4554a
parentaa331d194dd102a99ad0ea73ade57c553ca1c53d (diff)
Revert "change version information for release 0.4-beta2, from 0.4-beta1"
This reverts commit 872e4c72e5c01e0dedb4d7178fae7317232e48fc.
-rw-r--r--aegir.make6
-rw-r--r--docs/INSTALL.txt2
-rw-r--r--docs/UPGRADE.txt6
-rw-r--r--install.sh.txt2
-rw-r--r--provision.info2
-rw-r--r--upgrade.sh.txt2
6 files changed, 10 insertions, 10 deletions
diff --git a/aegir.make b/aegir.make
index 5f72dc8..f923a0b 100644
--- a/aegir.make
+++ b/aegir.make
@@ -4,6 +4,6 @@ api = 2
projects[drupal][type] = "core"
projects[hostmaster][type] = "profile"
-projects[hostmaster][download][type] = "get"
-projects[hostmaster][download][url] = "http://files.aegirproject.org/hostmaster-0.4-beta2.tgz"
-projects[hostmaster][download][directory_name] = "hostmaster"
+projects[hostmaster][download][type] = "git"
+projects[hostmaster][download][url] = "git://git.aegirproject.org/hostmaster.git"
+projects[hostmaster][download][branch] = "master"
diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index 9f99a7b..759b5b1 100644
--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@@ -286,7 +286,7 @@ aegir user can access in order to execute it. This file is available in
Provision or can be downloaded through the web with this command::
Shell commands::
- wget -O install.sh 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=provision-0.4-beta2'
+ wget -O install.sh 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=HEAD'
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 58d988e..d4ee037 100644
--- a/docs/UPGRADE.txt
+++ b/docs/UPGRADE.txt
@@ -57,7 +57,7 @@ Make sure you download it to somewhere that the aegir user can access in order
to execute it.
Shell commands::
- wget -O upgrade.sh.txt 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=upgrade.sh.txt;hb=provision-0.4-beta2'
+ wget -O upgrade.sh.txt 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=upgrade.sh.txt;hb=HEAD'
You may need to edit the script to set any variables that are different from the
defaults. Pay particular attention to the OLD_DRUPAL_DIR variable, as you may be
@@ -86,13 +86,13 @@ you are reading this document.
Shell commands::
- export AEGIR_VERSION=0.4-beta2
+ export AEGIR_VERSION=HEAD
export AEGIR_DIR=/var/aegir
export DRUPAL_DIR=$AEGIR_DIR/hostmaster-$AEGIR_VERSION
export DRUSH_VERSION=6.x-3.3
export DRUSH_MAKE_VERSION=6.x-2.0-beta9
export AEGIR_DOMAIN=aegir.example.com
- export OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-beta1
+ export OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-alpha9
This document also assumes drush is installed properly and we use an
environment variable to simplify the documentation again.
diff --git a/install.sh.txt b/install.sh.txt
index ea2f045..3876371 100644
--- a/install.sh.txt
+++ b/install.sh.txt
@@ -28,7 +28,7 @@
########################################################################
# guess the aegir version based on the info file
-AEGIR_VERSION="0.4-beta2"
+AEGIR_VERSION=HEAD
DRUSH_VERSION=6.x-3.3
########################################################################
diff --git a/provision.info b/provision.info
index 93f6f0c..0e82ccc 100644
--- a/provision.info
+++ b/provision.info
@@ -1,4 +1,4 @@
name=Provision
description="Aegir backend"
-version=0.4-beta2
+version=HEAD
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index 65e79ba..73adbcb 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -11,7 +11,7 @@
########################################################################
# basic variables, change before running
-AEGIR_VERSION="0.4-beta2"
+AEGIR_VERSION=HEAD
AEGIR_DOMAIN=aegir.example.com
AEGIR_DIR=/var/aegir