feat(conf): get var name from puppet (#77)

* feat(conf): get var name from puppet

Handle diffs between d7 and 8

* feat(distro): set conf name base on api version

* fix typo

* use string

* rename to settings

manifests/site.pp

@@ -31,9 +31,10 @@
  include drush
  include stdlib
 
+ $distros = lookup("drupalsi::distros")
+
  # Build the site root based on the distro information if siteroot is not specified.
  if (empty($siteroot)) {
- $distros = hiera("drupalsi::distros")
  $distro_root = $distros[$distro]['distro_root']
  $site_root = "$distro_root/$distro" 
  }
@@ -48,6 +49,17 @@
  $sitessubdir = $sites_subdir
  }
 
+ $confvar_name_d7 = 'conf'
+ $confvar_name_d8 = 'settings'
+
+ # Set the var name based on the api version.
+ if $distros[$distro]['api_version'] == '8' {
+ $confvar_name = $confvar_name_d8 
+ }
+ else {
+ $confvar_name = $confvar_name_d7
+ }
+
  # @todo create checks for other db types.
  $db_exists_check = "test ! \$(drush sqlq --db-url=${db_url} 'SELECT COUNT(DISTINCT table_name) FROM information_schema.columns WHERE table_schema = (SELECT DATABASE());' --extra='-r -s') -gt 0"
 

templates/settings.local.php.erb

@@ -4,11 +4,11 @@
  * This file is managed by Puppet and should not be edited
  *********************************************************/
 <% if @pubdir != '' and @pubdir != nil -%>
-$conf['file_public_path'] = '<%= @pubdir %>';
+$<%= @confvar_name %>['file_public_path'] = '<%= @pubdir %>';
 <% end -%>
 
 <% if @privdir != '' and @privdir != nil -%>
-$conf['file_private_path'] = '<%= @privdir %>';
+$<%= @confvar_name %>['file_private_path'] = '<%= @privdir %>';
 <% end -%>
 
 <% if @local_settings.is_a? String -%>