? 553230.patch
Index: INSTALL.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/profiles/hostmaster/INSTALL.txt,v
retrieving revision 1.37
diff -u -r1.37 INSTALL.txt
--- INSTALL.txt	20 Aug 2009 16:14:22 -0000	1.37
+++ INSTALL.txt	21 Aug 2009 09:29:01 -0000
@@ -39,8 +39,7 @@
 such as Cpanel, Plesk or AlternC will very likely create problems and
 is not supported.
 
-Shell commands:
-::
+Shell commands::
 
  apt-get install apache2
 
@@ -52,8 +51,7 @@
 or above. You also need to have the commandline version of PHP to run
 Drush properly and the MySQL extensions.
 
-Shell commands:
-::
+Shell commands::
 
  apt-get install php5 php5-cli php5-mysql
 
@@ -65,8 +63,7 @@
 supports MySQL. It is preferable to use a dedicated server since Aegir 
 will create database users and will require a privileged user.
 
-Shell commands:
-::
+Shell commands::
 
  apt-get install mysql-server
 
@@ -81,8 +78,7 @@
 removed because of this problem. To remedy the situation simply install
 an MTA like sendmail, postfix, or exim and do the minimal configuration.
 
-Shell commands:
-::
+Shell commands::
 
  apt-get install postfix
 
@@ -110,10 +106,10 @@
 In addition we will create a directory layout for Aegir configuration
 and backups.
 
-Shell commands:
-::
+Shell commands::
 
- adduser --system --home /var/aegir --ingroup www-data aegir
+ adduser --system --home /var/aegir aegir
+ adduser aegir www-data
  mkdir -p /var/aegir/config/vhost.d
  mkdir -p /var/aegir/backups
  chmod -R 0700 /var/aegir/{config,backups}
@@ -126,8 +122,7 @@
 If you want to install Aegir from CVS you will need to install ``cvs``
 command in the server system.
 
-Shell commands:
-::
+Shell commands::
 
  apt-get install cvs
 
@@ -154,13 +149,12 @@
 root password (usually debian) or alternatively you have a privileged
 user with sudo (usually ubuntu).
 
-If you have root password:
-::
+If you have root password::
 
  su -c "su -s /bin/bash aegir"
 
-If you have sudo privileges:
-::
+
+If you have sudo privileges::
 
  sudo -u aegir bash
 
@@ -172,8 +166,7 @@
 You should replace following command for current versions at the time
 you are reading this document.
 
-Shell commands:
-::
+Shell commands::
 
   export DRUPAL_DIR=/var/aegir/drupal-6.13
   export AEGIR_TAG=DRUPAL-6--0-3-RC4
@@ -186,15 +179,13 @@
 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:
-::
+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 for package download::
 
  cd /var/aegir
  wget http://ftp.drupal.org/files/projects/drush-All-Versions-2.0.tar.gz
@@ -203,8 +194,7 @@
 Additionally we will export another environment variable for the purpose
 of referencing drush executable in a shorter way.
 
-Shell commands:
-::
+Shell commands::
 
   export DRUSH=/var/aegir/drush/drush.php
 
@@ -215,13 +205,11 @@
 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:
-::
+Shell commands for cvs::
 
  cvs co -d .drush/provision -r$AEGIR_TAG contributions/modules/provision
 
-Shell commands for drush:
-::
+Shell commands for drush::
 
  mkdir .drush
  $DRUSH dl provision --destination=.drush
@@ -233,8 +221,7 @@
 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:
-::
+Shell commands::
 
  $DRUSH dl drupal
  cd $DRUPAL_DIR
@@ -243,13 +230,11 @@
 Installing hostmaster profile
 -----------------------------
 
-Shell commands for cvs:
-::
+Shell commands for cvs::
 
  cvs co -d profiles/hostmaster -r$AEGIR_TAG contributions/profiles/hostmaster
  
-Shell commands for drush:
-::
+Shell commands for drush::
 
  $DRUSH dl --destination=./profiles hostmaster
 
@@ -257,13 +242,11 @@
 Installing hosting module
 -------------------------
 
-Shell commands for cvs:
-::
+Shell commands for cvs::
 
  cvs co -d profiles/hostmaster/modules/hosting -r$AEGIR_TAG contributions/modules/hosting
 
-Shell commands for drush:
-::
+Shell commands for drush::
 
  mkdir profiles/hostmaster/modules
  $DRUSH dl --destination=./profiles/hostmaster/modules hosting
@@ -275,8 +258,7 @@
 Hostmaster profile depends on Install Profile API module version 2.1. 
 Following command will force to download correct version.
 
-Shell commands:
-::
+Shell commands::
 
  $DRUSH dl --destination=./profiles/hostmaster/modules install_profile_api-6.x-2.1
 
@@ -291,13 +273,11 @@
 Installing Eldir theme
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Shell commands for cvs:
-::
+Shell commands for cvs::
 
  cvs co -d profiles/hostmaster/themes/eldir -r$AEGIR_TAG contributions/themes/eldir
  
-Shell commands for drush:
-::
+Shell commands for drush::
 
  mkdir profiles/hostmaster/themes
  $DRUSH dl --destination=$DRUPAL_DIR/profiles/hostmaster/themes eldir
@@ -306,8 +286,7 @@
 Installing Admin menu module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Shell commands:
-::
+Shell commands::
 
  $DRUSH dl --destination=$DRUPAL_DIR/profiles/hostmaster/modules admin_menu
 
@@ -335,8 +314,7 @@
 particularly the path leading to the Drupal core ($DRUPAL_DIR in the
 examples above).
 
-Shell commands:
-::
+Shell commands::
 
  cp profiles/hostmaster/apache2.conf.txt ../config/vhost.d/aegir.example.com
  # edit and configure
@@ -357,8 +335,7 @@
 
 Following commands are to be run as root.
 
-Shell commands:
-::
+Shell commands::
 
  a2enmod rewrite
  echo "Include /var/aegir/config/vhost.d/" > /etc/apache2/conf.d/aegir
@@ -371,9 +348,7 @@
 At this point, you have checked out all the code and setup your basic
 Drupal (Drupal core, hosting, hostmaster and eldir) that will be the
 Aegir frontend and the backend system (provision and drush). Your
-filesystem layout should look something like that:
-
-::
+filesystem layout should look something like that::
 
  /var/aegir/drupal-6.x
  /var/aegir/drupal-6.x/profiles/hostmaster
@@ -399,8 +374,7 @@
 you are going to install. You want to run those commands using your
 database 'root' user.
 
-SQL commands:
-::
+SQL commands::
 
  CREATE DATABASE aegir;
  GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, \
@@ -438,8 +412,7 @@
 
 Run these commands as the aegir user.
 
-Shell commands:
-::
+Shell commands::
 
  mkdir sites/aegir.example.com
  cp sites/default/default.settings.php sites/aegir.example.com/settings.php
@@ -454,17 +427,17 @@
 yet, and wait until the next step is finished, then change the
 permissions back to normal.
 
-Shell commands:
-::
+Shell commands::
 
  chmod a-w sites/aegir.example.com/settings.php
 
 The delay is due to an issue with the Drupal 6 core that doesn't see the
 themes in profiles directories. We had to install a workaround for this
-to work that needs settings.php writable a bit longer. See:
+to work that needs settings.php writable a bit longer. See::
+
+ http://drupal.org/node/534302
+ http://drupal.org/node/330297
 
-http://drupal.org/node/534302
-http://drupal.org/node/330297
 
 Follow the wizard
 -----------------
