Commit f7fd1fcb authored by Marco Mariani's avatar Marco Mariani

$ -> $$

parent 1276ba7a
...@@ -2,11 +2,20 @@ ...@@ -2,11 +2,20 @@
[publish-drupal-admin-password] [publish-drupal-admin-password]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
drupal-admin-password = $${drupal-init-base:admin-password} drupal-admin-password = $${drupal-init:admin-password}
[drupal-init-base] [drupal-init-datapublic]
recipe = cp.recipe.cmd
install_cmd =
mkdir -m 700 ~/.ssh
cp ${ssh-config:location}/ssh-config ~/.ssh/config
${apache-php:location}/bin/drush make ${datapublic:location}/datapublic.make $${rootdirectory:srv}/www
[drupal-init]
recipe = slapos.cookbook:drupal_init recipe = slapos.cookbook:drupal_init
dependencry = $${drupal-init-datapublic:recipe}
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
settings-php = ${application-configuration:location} settings-php = ${application-configuration:location}
...@@ -25,10 +34,3 @@ storage-path = $${rootdirectory:srv}/drupal_passwd ...@@ -25,10 +34,3 @@ storage-path = $${rootdirectory:srv}/drupal_passwd
bytes = 16 bytes = 16
[drupal-init]
recipe = cp.recipe.cmd
install_cmd =
mkdir -m 700 ~/.ssh
cp ${ssh-config:location}/ssh-config ~/.ssh/config
$${drupal-init-base:drush-binary} make ${datapublic:location}/datapublic.make $${drupal-init-base:htdocs}
...@@ -50,7 +50,7 @@ part-list = drupal-init publish-drupal-admin-password ...@@ -50,7 +50,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 = d0ca0431172f7f431a687a359697822a md5sum = 78864da25f0272a870cfe2d811d9365a
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