$ -> $$

software/DrupalDataPublic/instance-custom.cfg.in

@@ -2,11 +2,20 @@
 
 [publish-drupal-admin-password]
 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
+dependencry = $${drupal-init-datapublic:recipe}
 drush-binary = ${apache-php:location}/bin/drush
 php-binary = ${apache-php:location}/bin/php
 settings-php = ${application-configuration:location}
@@ -25,10 +34,3 @@ storage-path = $${rootdirectory:srv}/drupal_passwd
 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}
-

software/DrupalDataPublic/software.cfg

@@ -50,7 +50,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 = d0ca0431172f7f431a687a359697822a
+md5sum = 78864da25f0272a870cfe2d811d9365a
 mode = 0644