Clean up the previous commit and set the private path for D7.

Provision/Config/Drupal/Settings.php

@@ -17,12 +17,13 @@ class Provision_Config_Drupal_Settings extends Provision_Config {
   function process() {
     if (drush_drupal_major_version() >= 7) {
       $this->data['db_type'] = ($this->data['db_type'] == 'mysqli') ? 'mysql' : $this->data['db_type'];
-      $this->file_directory_path_var = 'file_public_path';
-      $this->file_directory_temp_var = 'file_temporary_path';
+      $this->data['file_directory_path_var'] = 'file_public_path';
+      $this->data['file_directory_temp_var'] = 'file_temporary_path';
+      $this->data['file_directory_private_var'] = 'file_private_path';
     }
     else {
-      $this->file_directory_path_var = 'file_directory_path';
-      $this->file_directory_temp_var = 'file_directory_temp';
+      $this->data['file_directory_path_var'] = 'file_directory_path';
+      $this->data['file_directory_temp_var'] = 'file_directory_temp';
     }
     $this->version = provision_version();
     $this->api_version = provision_api_version();

Provision/Config/Drupal/provision_drupal_settings.tpl.php

@@ -124,8 +124,11 @@ print '<?php' ?>
 
   global $conf;
   $conf['install_profile'] = '<?php print $this->profile ?>';
-  $conf['<?php print $this->file_directory_path_var ?>'] = 'sites/<?php print $this->uri ?>/files';
-  $conf['<?php print $this->file_directory_temp_var ?>'] = 'sites/<?php print $this->uri ?>/files/tmp';
+  $conf['<?php print $file_directory_path_var ?>'] = 'sites/<?php print $this->uri ?>/files';
+  $conf['<?php print $file_directory_temp_var ?>'] = 'sites/<?php print $this->uri ?>/private/temp';
+  <?php if (isset($file_directory_private_var)): ?>
+  $conf['<?php print $file_directory_private_var ?>'] = 'sites/<?php print $this->uri ?>/private/files';
+  <?php endif; ?>
   $conf['clean_url'] = 1;
   $conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;