Commit 7b6fae8d authored by Marco Mariani's avatar Marco Mariani

require/provide installation profile name

parent 30a9f53d
...@@ -74,12 +74,13 @@ class InitRecipe(GenericBaseRecipe): ...@@ -74,12 +74,13 @@ class InitRecipe(GenericBaseRecipe):
if self.is_db_empty(php_binary=self.options['php-binary'], if self.is_db_empty(php_binary=self.options['php-binary'],
settings_php=settings_php): settings_php=settings_php):
drush_output = subprocess.check_output([drush_binary, subprocess.check_output([drush_binary,
'-y', 'site-install', '-y', 'site-install',
'--account-name=admin', self.options['profile'],
'--account-pass=%s' % self.options['admin-password'], '--account-name=admin',
], '--account-pass=%s' % self.options['admin-password'],
stderr=subprocess.STDOUT) ],
stderr=subprocess.STDOUT)
# drush removes the 'w' bit from both the settings file and its # drush removes the 'w' bit from both the settings file and its
# directory. # directory.
......
...@@ -9,6 +9,7 @@ drupal-admin-password = $${drupal-init:admin-password} ...@@ -9,6 +9,7 @@ drupal-admin-password = $${drupal-init:admin-password}
recipe = slapos.cookbook:drupal_init recipe = slapos.cookbook:drupal_init
drush-binary = ${apache-php:location}/bin/drush drush-binary = ${apache-php:location}/bin/drush
php-binary = ${apache-php:location}/bin/php php-binary = ${apache-php:location}/bin/php
profile = standard
settings-php = ${application-configuration:location} settings-php = ${application-configuration:location}
htdocs = $${rootdirectory:srv}/www htdocs = $${rootdirectory:srv}/www
admin-password = $${gen-passwd:passwd} admin-password = $${gen-passwd:passwd}
......
...@@ -34,7 +34,7 @@ part-list = drupal-init publish-drupal-admin-password ...@@ -34,7 +34,7 @@ part-list = drupal-init publish-drupal-admin-password
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-custom.cfg.in url = ${:_profile_base_location_}/instance-custom.cfg.in
output = ${buildout:directory}/instance-custom.cfg output = ${buildout:directory}/instance-custom.cfg
md5sum = 30b3d75d79916ae25ef19969499a3aa2 md5sum = eedb3f91b9382234ab4289e8c404a454
mode = 0644 mode = 0644
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment