Merge branch 'drupal2'

Conflicts:
	software/drupal/software.cfg

software/drupal/settings.php.in

@@ -200,12 +200,23 @@
  *   );
  * @endcode
  */
+
+/*
++ * The apachephp recipe provided with both host+port in the same string.
++ * Split them again, php way.
++ * And it could be an ipv6 as well, so beware of colons.
++ */
+$mysql_host_port = '%(mysql_host)s';
+$mysql_port = substr(strrchr($mysql_host_port, ":"), 1);
+$mysql_host = substr($mysql_host_port, 0, strlen($mysql_host_port) - strlen($mysql_port) - 1);
+
 $databases['default']['default'] = array(
   'driver' => 'mysql',
   'database' => '%(mysql_database)s',
   'username' => '%(mysql_user)s',
   'password' => '%(mysql_password)s',
-  'host' => '%(mysql_host)s',
+  'host' => $mysql_host,
+  'port' => $mysql_port,
   'prefix' => '',
 );
 

software/drupal/software.cfg

@@ -3,15 +3,23 @@
 extends =
   ../../stack/lamp/buildout.cfg
 
+parts +=
+  patch-css
+
+
 [application]
 recipe = slapos.recipe.build:download-unpacked
 url = http://ftp.drupal.org/files/projects/drupal-7.16.tar.gz
 md5sum = 352497b2df94b5308e31cb8da020b631
 
+[patch-css]
+recipe = cp.recipe.cmd
+install_cmd = patch ${application:location}/modules/system/system.theme.css <${:_profile_base_location_}/system.theme.css.patch
+
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/settings.php.in
-md5sum = add9e4e96094a9d3fb7cf0f4d26ae544
+md5sum = b0ef5548c3ac1de8ca56882e51e6eb6d
 download-only = True
 filename = template.in
 mode = 0644

software/drupal/system.theme.css.patch

+--- a/system.theme.css  Mon Oct 29 11:20:30 2012 +0100
++++ b/system.theme.css  Mon Oct 29 11:20:53 2012 +0100
+@@ -1,3 +1,14 @@
++
++#install-settings-form .form-item-driver,
++#install-settings-form #edit-mysql * {
++  display: none;
++}
++
++#install-settings-form #edit-mysql:before {
++  content: "The database has been set up by SlapOS.";
++  font-weight: bold;
++  font-size: 120%;
++}
+ 
+ /**
+  * @file
+