From 7b6fae8d128ac076307a25a4aa63da95842e10fc Mon Sep 17 00:00:00 2001
From: Marco Mariani <marco.mariani@nexedi.com>
Date: Sun, 7 Apr 2013 16:50:19 +0200
Subject: [PATCH] require/provide installation profile name

---
 slapos/recipe/drupal/__init__.py       | 13 +++++++------
 software/drupal/instance-custom.cfg.in |  1 +
 software/drupal/software.cfg           |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/slapos/recipe/drupal/__init__.py b/slapos/recipe/drupal/__init__.py
index 2a121bb1d..21d73f202 100644
--- a/slapos/recipe/drupal/__init__.py
+++ b/slapos/recipe/drupal/__init__.py
@@ -74,12 +74,13 @@ class InitRecipe(GenericBaseRecipe):
         if self.is_db_empty(php_binary=self.options['php-binary'],
                             settings_php=settings_php):
 
-            drush_output = subprocess.check_output([drush_binary,
-                                                   '-y', 'site-install',
-                                                   '--account-name=admin',
-                                                   '--account-pass=%s' % self.options['admin-password'],
-                                                   ],
-                                                   stderr=subprocess.STDOUT)
+            subprocess.check_output([drush_binary,
+                                     '-y', 'site-install',
+                                     self.options['profile'],
+                                     '--account-name=admin',
+                                     '--account-pass=%s' % self.options['admin-password'],
+                                     ],
+                                     stderr=subprocess.STDOUT)
 
             # drush removes the 'w' bit from both the settings file and its
             # directory.
diff --git a/software/drupal/instance-custom.cfg.in b/software/drupal/instance-custom.cfg.in
index 40c614e3e..85914722e 100644
--- a/software/drupal/instance-custom.cfg.in
+++ b/software/drupal/instance-custom.cfg.in
@@ -9,6 +9,7 @@ drupal-admin-password = $${drupal-init:admin-password}
 recipe = slapos.cookbook:drupal_init
 drush-binary = ${apache-php:location}/bin/drush
 php-binary = ${apache-php:location}/bin/php
+profile = standard
 settings-php = ${application-configuration:location}
 htdocs = $${rootdirectory:srv}/www
 admin-password = $${gen-passwd:passwd}
diff --git a/software/drupal/software.cfg b/software/drupal/software.cfg
index cb87803bc..26385b2b4 100644
--- a/software/drupal/software.cfg
+++ b/software/drupal/software.cfg
@@ -34,7 +34,7 @@ part-list = drupal-init publish-drupal-admin-password
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-custom.cfg.in
 output = ${buildout:directory}/instance-custom.cfg
-md5sum = 30b3d75d79916ae25ef19969499a3aa2
+md5sum = eedb3f91b9382234ab4289e8c404a454
 mode = 0644
 
 
-- 
2.30.9