Index: INSTALL.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/profiles/hostmaster/INSTALL.txt,v
retrieving revision 1.46
diff -u -r1.46 INSTALL.txt
--- INSTALL.txt	7 Oct 2009 22:13:51 -0000	1.46
+++ INSTALL.txt	12 Oct 2009 13:16:42 -0000
@@ -83,6 +83,17 @@
  apt-get install postfix
 
 
+CVS commands
+------------
+
+Now Aegir install itself from CVS (by using given tags) so if you dont
+have it you will need to install ``cvs`` command in the server system.
+
+Shell commands::
+
+ apt-get install cvs
+
+
 Aegir user
 ----------
 
@@ -117,17 +128,6 @@
  chown -R aegir /var/aegir/*
 
 
-CVS commands
-------------
-
-If you want to install Aegir from CVS you will need to install ``cvs``
-command in the server system.
-
-Shell commands::
-
- apt-get install cvs
-
-
 Aegir installation instructions
 ===============================
 
@@ -135,14 +135,6 @@
 instructions limit themselves to getting you into the Aegir wizard,
 which will then give you further configuration instructions.
 
-You can choose to install Aegir from CVS or by using drush. If you 
-opt for drush, make sure the versions reported in the output is correct.
-
-Installation instructions presents you in each step both
-alternative instructions to checkout from CVS or download with drush 
-each component of Aegir. Be warned that in the hours following a new
-release, drush will not catch up the correct versions.
-
 All instructions and in general all commands must be run as aegir user,
 so all permissions are always set correctly.
 
@@ -154,16 +146,15 @@
 
 Additionally to make following instructions generic and not dependant on
 a concrete Drupal or Aegir version. We will use bash environment
-variables for this. So current Drupal is 6.14 and Aegir release is
-0.4-alpha2.
+variables for this. So current Aegir release is 0.4-alpha2.
 
 You should replace following command for current versions at the time
 you are reading this document.
 
 Shell commands::
 
-  export DRUPAL_DIR=/var/aegir/drupal-6.14
   export AEGIR_TAG=DRUPAL-6--0-4-ALPHA2
+  export HOSTMASTER_DIR=hostmaster-0.4-alpha2
 
 
 Installing drush 2.0
@@ -173,117 +164,68 @@
 is 2.0. Perhaps a newer version does exist and this document is not
 updated yet. You should use the latest stable version of the 2.x branch.
 
-Shell commands for cvs::
-
- cd /var/aegir
- export CVSROOT=:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal
- cvs co -d drush -rDRUPAL-6--2-0 contributions/modules/drush
-
-Shell commands for package download::
+Shell commands::
 
  cd /var/aegir
  wget http://ftp.drupal.org/files/projects/drush-All-Versions-2.0.tar.gz
  tar -xvzf drush-All-Versions-2.0.tar.gz
  rm drush-All-Versions-2.0.tar.gz
+ mkdir .drush
 
-Additionally we will export another environment variable for the purpose
-of referencing drush executable in a shorter way.
+So we have drush downloaded to /var/aegir/drush. It is not in the system
+path so we must explicitly call it by using the complete path. 
+We have also created /var/aegir/.drush folder to put inside drush
+commands that will only be available to Aegir's user. Drush
+documentation will teach you more about those and other configuration
+instructions.
+
+
+Installing drush_make
+---------------------
+
+Now Aegir use makefiles to work with drush_make and automate the
+installation of components. This drastically reduce amount of manual 
+downloads to perform, but mainly also make some Aegir components aware
+of compatible version for other components.
+
+At the time of this writting drush_make is at version 1.0-beta and a
+rewrite for version 2 is on the road. Using version 1.0-beta do the work
+in despite of the errors it will show you.
 
 Shell commands::
 
-  export DRUSH=/var/aegir/drush/drush.php
-
+  $ drush/drush dl drush_make --destination=.drush
+  
 
 Downloading provision framework
 -------------------------------
 
-The provision framework is not a drupal module but a drush extension. So
-it must be placed in ``/var/aegir/.drush`` for drush to be able to find it.
-
-Shell commands for cvs::
-
- cvs co -d .drush/provision -r$AEGIR_TAG contributions/modules/provision
-
-Shell commands for drush::
-
- mkdir .drush
- $DRUSH dl provision --destination=.drush
+The provision framework is not a drupal module but a drush extension, 
+and it *must* always be run as Aegir's user to avoid further permission
+problems. So we will place it in ``/var/aegir/.drush`` to ensure that.
 
-
-Installing drupal
------------------
-
-Drush is able to download latest version of Drupal. Be sure that the
-downloaded version is the same you put in $DRUPAL_DIR in above.
-
-Shell commands::
-
- $DRUSH dl drupal
- cd $DRUPAL_DIR
-
-
-Installing hostmaster profile
------------------------------
-
-Shell commands for cvs::
-
- cvs co -d profiles/hostmaster -r$AEGIR_TAG contributions/profiles/hostmaster
- 
-Shell commands for drush::
-
- $DRUSH dl --destination=./profiles hostmaster
-
-
-Installing hosting module
--------------------------
-
-Shell commands for cvs::
-
- cvs co -d profiles/hostmaster/modules/hosting -r$AEGIR_TAG contributions/modules/hosting
-
-Shell commands for drush::
-
- mkdir profiles/hostmaster/modules
- $DRUSH dl --destination=./profiles/hostmaster/modules hosting
-
-
-Installing install_profile_api module
--------------------------------------
-
-Hostmaster profile depends on Install Profile API module version 2.1. 
-Following command will force to download correct version.
+Note the command include the current Aegir stable tag at the time of
+this writting. It may be changed by the time you read this.
 
 Shell commands::
 
- $DRUSH dl --destination=./profiles/hostmaster/modules install_profile_api-6.x-2.1
-
-
-Checking out the optional components
-------------------------------------
-
-Aegir has its own theme which you can use. Theme is called Eldir. It is
-also suggested that you install admin_menu to ease administration.
-
-
-Installing Eldir theme
-~~~~~~~~~~~~~~~~~~~~~~
+ cvs co -d .drush/provision -r$AEGIR_TAG contributions/modules/provision
 
-Shell commands for cvs::
 
- cvs co -d profiles/hostmaster/themes/eldir -r$AEGIR_TAG contributions/themes/eldir
- 
-Shell commands for drush::
+Installing the front end
+------------------------
 
- mkdir profiles/hostmaster/themes
- $DRUSH dl --destination=./profiles/hostmaster/themes eldir
+As stated above, Aegir now uses makefiles to download the components.
 
+Provision framework ships with aegir.make, that is responsible of
+downloading Drupal core and Hostmaster profile.
 
-Installing Admin menu module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Hostmaster profile also ships hostmaster.make that will download 
+required and optional components for Aegir.
 
 Shell commands::
 
- $DRUSH dl --destination=./profiles/hostmaster/modules admin_menu
+ drush/drush hostmaster make $HOSTMASTER_DIR
 
 
 Apache configuration
@@ -313,11 +255,12 @@
 
 Hostmaster provides an example virtualhost for apache. Copy it to Aegir's
 virtual hosts directory and **modify** it to suit your needs,
-particularly the path leading to the Drupal core ($DRUPAL_DIR in the
+particularly the path leading to the Drupal core ($HOSTMASTER_DIR in the
 examples above).
 
 Shell commands::
- export AEGIR_DOMAIN=aegir.example.com
+ export AEGIR_DOMAIN=aegir.example.com 
+ cd $HOSTMASTER_DIR
  cp profiles/hostmaster/apache2.conf.txt ../config/vhost.d/$AEGIR_DOMAIN
  # edit and configure
 
@@ -350,12 +293,12 @@
 Aegir frontend and the backend system (provision and drush). Your
 filesystem layout should look something like that::
 
- /var/aegir/drupal-6.x
- /var/aegir/drupal-6.x/profiles/hostmaster
- /var/aegir/drupal-6.x/profiles/hostmaster/modules/hosting
- /var/aegir/drupal-6.x/profiles/hostmaster/modules/install_profile_api
- /var/aegir/drupal-6.x/profiles/hostmaster/themes/eldir
- /var/aegir/drupal-6.x/sites/aegir.example.com
+ /var/aegir/hostmaster-0.x
+ /var/aegir/hostmaster-0.x/profiles/hostmaster
+ /var/aegir/hostmaster-0.x/profiles/hostmaster/modules/hosting
+ /var/aegir/hostmaster-0.x/profiles/hostmaster/modules/install_profile_api
+ /var/aegir/hostmaster-0.x/profiles/hostmaster/themes/eldir
+ /var/aegir/hostmaster-0.x/sites/aegir.example.com
  /var/aegir/config/vhost.d
  /var/aegir/backups
  /var/aegir/drush/drush.php
@@ -422,15 +365,6 @@
  chgrp www-data sites/$AEGIR_DOMAIN/settings.php
  chgrp www-data sites/$AEGIR_DOMAIN/files
  
-Now point your browser to ``http://$AEGIR_DOMAIN/``, select the
-hostmaster install profile, enter the database credentials you setup 
-above and then the installer will prompt you to secure the permissions
-on the settings.php file again.
-
-Shell commands::
-
- chmod a-w sites/$AEGIR_DOMAIN/settings.php
-
 
 Follow the wizard
 -----------------
