? 553230.patch
? 553230_0.patch
Index: INSTALL.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/profiles/hostmaster/INSTALL.txt,v
retrieving revision 1.30
diff -r1.30 INSTALL.txt
8c8
< Aegir 0.2 requirements
---
> Aegir 0.3 requirements
13a14,27
> Aegir must run some UNIX flavour because the majority of functionality
> in this system occurs in the back-end, through command line scripting. 
> There are also several features (such as symlinks), that are not 
> available to users on Windows. There are no plans currently to add 
> windows support.
> 
> The level of access required to be able to configure this system is very
> far beyond what is commonly available to users with shared hosting.
> 
> Following instructions will provide example commands for a Debian-like
> distribution. They are assumed to be run as root user. Prefix them with
> sudo if you are not working with a privileges user instead of root.
> 
> 
24,29d37
< That webserver should probably run some UNIX flavour because the
< majority of functionality in this system occurs in the back-end,
< through command line scripting. There are also several features (such
< as symlinks), that are not available to users on Windows. There are no
< plans currently to add windows support.
< 
43,44c51,52
< MySQL server
< ------------
---
> Database server
> ---------------
46,48c54,59
< You will require a MySQL server, obviously. It is preferable to use a
< dedicated server since Aegir will create MySQL users, since it will
< require a "root" MySQL user.
---
> You will require a database server, obviously. Aegir currently only 
> supports MySQL. It is preferable to use a dedicated server since Aegir 
> will create database users, since it will require a privileged user.
> 
> Shell commands::
>  apt-get install mysql-server
56c67
< with message like "could not send email." Additional messages will
---
> with message like "could not send email.". Additional messages will
59c70
< the minimal configuration.  On Debian-based systems do:
---
> the minimal configuration.
62c73
<  sudo apt-get install postfix
---
>  apt-get install postfix
64c75,76
< Once that is done you should be able to install a site to the new platform. 
---
> Once that is done you should be able to install a site to the new 
> platform. 
66,67c78,95
< Other requirements
< ------------------
---
> Aegir user
> ----------
> The provision framework of Aegir requires that the scripts run as a 
> non-root system account, to ensure that it can correctly set the file
> permissions on the hosted files. 
> 
> In addition to ensure that the file permissions of the hosted sites are
> always as safe as can be, and especially to make sure that the web server
> does not have the ability to modify the code of the site, the configured
> system account needs to be a member of the web server group, in order to 
> be able to correctly set the file permissions.
> 
> More detailed instructions on this topic will be given later in the web 
> installation wizard.
> 
> This document assumes the Aegir user is «aegir», its home directory is
> /var/aegir and the webserver group is www-data. You can choose other
> username if desired.
69,71c97,106
< * never run drush as root. aegir is designed to be ran as its own user.
< * the "aegir directory" (/var/aegir) *must* be the home directory of
<   that user (the "aegir user", below)
---
> Shell commands::
>  adduser --system --home /var/aegir --ingroup www-data aegir
> 
> CVS commands
> ------------
> If you 
> To install cvs in the server system. 
> 
> Shell commands::
>  apt-get install cvs
73c108
< Aegir 0.2 installation instructions
---
> Aegir 0.3 installation instructions
80,82c115,117
< This document assumes the Aegir home is in /var/aegir, adapt as desired,
< but make sure that the user you create (as suggested in the install
< wizard) has this directory configured as its home directory.
---
> You can choose to install Aegir from CVS or by using drush.
> Checking out Aegir's code from CVS allows you to easily update to 
> future newer versions.
84,85c119,122
< Checking out the code
< ---------------------
---
> Following 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 the 
> release drush will not catch up the correct versions.
87,88c124,125
< This assumes you have installed CVS. Those commands should be ran as the
< aegir user and assume it can write to /var/aegir.
---
> All instructions and in general all commands must be run as aegir
> user, so all permissions are always set correctly.
89a127,129
> To become aegir user depends on your system configuration: if you 
> have root password (usually debian) or alternatively you have a 
> privileged user with sudo (usually ubuntu).
91,93c131,137
< Shell commands::
<  export CVSROOT=:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal
<  mkdir /var/aegir
---
> If you have root password: su -c "su -s /bin/bash aegir"
> If you have sudo privileges: sudo -u aegir bash
> 
> Installing drush
> ----------------
> 
> Shell commands for cvs::
94a139
>  export CVSROOT=:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal
97,98c142,161
<  cd .drush && /var/aegir/drush/drush.php dl provision
<  cd ../
---
> 
> Shell commands for package download::
>  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
>  mkdir .drush
>  
> Downloading provision framework
> -------------------------------
> 
> Shell commands for cvs::
>  cvs co -d .drush/provision -rDRUPAL-6--0-3-RC3 contributions/modules/provision
> 
> Shell commands for drush::
>  /var/aegir/drush/drush.php dl provision --destination=.drush
>  
> Downloading drupal
> ------------------
> 
> Shell commands:: 
100,103c163,184
<  cd drupal-6.*
<  cvs co -d profiles/hostmaster -rDRUPAL-6--0-3 contributions/profiles/hostmaster
<  cd profiles/hostmaster
<  /var/aegir/drush/drush.php dl hosting install_profile_api 
---
>  cd drupal-6.x
> 
> Downloading hostmaster profile
> ------------------------------
> Shell commands for cvs::
>  cvs co -d profiles/hostmaster -rDRUPAL-6--0-3-RC3 contributions/profiles/hostmaster
>  
> Shell commands for drush::
>  /var/aegir/drush/drush.php dl --destination=/var/aegir/drupal-6.x/profiles hostmaster
> 
> Downloading hosting module
> --------------------------
> Shell commands for cvs::
>  cvs co -d profiles/hostmaster/modules/hosting -rDRUPAL-6--0-3-RC3 contributions/modules/hosting
>  
> Shell commands for drush::
>  mkdir profiles/hostmaster/modules
>  /var/aegir/drush/drush.php dl --destination=/var/aegir/drupal-6.x/profiles/hostmaster/modules hosting
> 
> Downloading install_profile_api module
> --------------------------------------
> Hostmaster profile depends on Install Profile API module.
105,106c186,187
< We still use CVS to checkout the hostmaster profile because drush has
< problems downloading profiles: http://drupal.org/node/500324
---
> Shell commands:
>   /var/aegir/drush/drush.php dl --destination=/var/aegir/drupal-6.x/profiles/hostmaster/modules hosting
110,111c191,192
< projets. Make sure the versions reported by drush in the output seem
< right.
---
> projects. If you have used drush make sure the versions reported in
> the output seem right.
119,123c200,210
< Note that now your drush installation should be up and running so you
< can start using it to download modules directly. This is how
< admin_menu is installed below. The theme is installed using CVS
< because the release may not yet be available when you read this
< document.
---
> Installing Eldir theme
> ----------------------
> Shell commands for cvs::
>  cvs co -d profiles/hostmaster/modules/hosting -rDRUPAL-6--0-3-RC3 contributions/themes/eldir
>  
> Shell commands for drush::
>  mkdir profiles/hostmaster/themes
>  /var/aegir/drush/drush.php dl --destination=/var/aegir/drupal-6.x/profiles/hostmaster/themes eldir
> 
> Installing Admin menu module
> ----------------------------
126,127c213
<  cd drupal-6.*/profiles/hostmaster
<  /var/aegir/drush/drush.php dl eldir admin_menu
---
>  /var/aegir/drush/drush.php dl --destination=/var/aegir/drupal-6.x/profiles/hostmaster/modules admin_menu
132,134c218,219
< Those instructions assume you are running Debian specific and
< installing aegir in http://aegir.example.com. If you are running
< another system you basically need to:
---
> Those instructions assume you are installing aegir in http://aegir.example.com.
> If you are running another system you basically need to:
142c227
< So this needs to be ran as root too.
---
> So this needs to be run as root too.
146a232,233
>  chown -R aegir:aegir config
>  chmod 0700 /var/aegir/config
150c237
<  cp drupal-6.*/profiles/hostmaster/apache2.conf.txt config/vhost.d/aegir.example.com
---
>  cp drupal-6.x/profiles/hostmaster/apache2.conf.txt config/vhost.d/aegir.example.com
151a239,241
>  mkdir /var/aegir/backups
>  chown aegir:aegir /var/aegir/backups
>  chmod 0700 /var/aegir/backups
155c245
< (/var/aegir/drupal-6.* in the example above).
---
> (/var/aegir/drupal-6.x in the example above).
165,170c255,260
< /var/aegir/drupal-6.13
< /var/aegir/drupal-6.13/profiles/hostmaster
< /var/aegir/drupal-6.13/profiles/hostmaster/modules/hosting
< /var/aegir/drupal-6.13/profiles/hostmaster/modules/install_profile_api
< /var/aegir/drupal-6.13/profiles/hostmaster/themes/eldir
< /var/aegir/drupal-6.13/sites/aegir.example.com
---
> /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
197,200c287,288
< Now you are ready to install the first Drupal using this installation
< profile. Point your browser to http://aegir.example.com/ , assuming
< DNS is properly configured to point to your webserver, otherwise you
< may want to try http://localhost/ .
---
> We are almost ready to install the first Drupal using this installation
> profile. The installer is going to complain about the missing settings.php.
202,203c290,295
< The installer is going to complain about the missing settings.php. It
< is recommended that you create the aegir site as a real site.
---
> It is recommended that you create the aegir site as a real site in the sites/
> directory. The following commands will create this site directory and create
> the settings.php and files directory with the appropriate permissions to
> proceed through the installer.
> 
> Run these commands as the aegir user.
206,207c298,306
<  mkdir drupal-6.*/sites/aegir.example.com
<  chmod a+w drupal-6.*/sites/aegir.example.com/settings.php
---
>  mkdir drupal-6.x/sites/aegir.example.com
>  cp drupal-6.x/sites/default/default.settings.php drupal-6.x/sites/aegir.example.com/settings.php
>  chmod a+w drupal-6.x/sites/aegir.example.com/settings.php
>  mkdir drupal-6.x/sites/aegir.example.com/files
>  chmod 2770 drupal-6.x/sites/aegir.example.com/files
> 
> Now point your browser to http://aegir.example.com/ , assuming
> DNS is properly configured to point to your webserver, otherwise you
> may want to try http://localhost/ .
214c313
<  chmod a-w /var/aegir/drupal-6.*/sites/aegir.example.com/settings.php
---
>  chmod a-w /var/aegir/drupal-6.x/sites/aegir.example.com/settings.php