Merge pull request #207 from tampakrap/server_config_more_cleanup

better handling of the directoryenv configuration

Author: zachfi

manifests/server.pp

@@ -27,35 +27,35 @@
 #  }
 #
 class puppet::server (
-  $autosign           = undef,
-  $bindaddress        = '0.0.0.0',
-  $ca                 = false,
-  $config_version_cmd = '/usr/bin/git --git-dir $confdir/environments/$environment/.git rev-parse --short HEAD 2>/dev/null || echo',
-  $dns_alt_names      = undef,
-  $enc                = '',
-  $enc_exec           = '',
-  $ensure             = 'present',
-  $directoryenvs      = true,
-  $environmentpath    = undef,
-  $basemodulepath     = [],
-  $default_manifest   = undef,
-  $manage_package     = true,
-  $manifest           = '$confdir/modules/site/site.pp',
-  $modulepath         = ['$confdir/modules/site', '$confdir/env/$environment/dist'],
-  $parser             = undef,
-  $manage_puppetdb    = false,
-  $report             = true,
-  $report_dir         = $puppet::params::report_dir,
-  $reportfrom         = undef,
-  $reports            = ['store', 'https'],
-  $reporturl          = "https://${::fqdn}/reports",
-  $servername         = $::fqdn,
-  $serverssl_ciphers  = undef,
-  $serverssl_protos   = undef,
-  $servertype         = 'unicorn',
-  $storeconfigs       = undef,
-  $stringify_facts    = false,
-  $package            = $puppet::params::master_package,
+  $autosign          = undef,
+  $bindaddress       = '0.0.0.0',
+  $ca                = false,
+  $config_version    = '/usr/bin/git --git-dir $confdir/environments/$environment/.git rev-parse --short HEAD 2>/dev/null || echo',
+  $dns_alt_names     = undef,
+  $enc               = '',
+  $enc_exec          = '',
+  $ensure            = 'present',
+  $directoryenvs     = true,
+  $environmentpath   = '$confdir/environments',
+  $basemodulepath    = [],
+  $default_manifest  = undef,
+  $manage_package    = true,
+  $manifest          = undef,
+  $modulepath        = [],
+  $parser            = undef,
+  $manage_puppetdb   = false,
+  $report            = true,
+  $report_dir        = $puppet::params::report_dir,
+  $reportfrom        = undef,
+  $reports           = ['store', 'https'],
+  $reporturl         = "https://${::fqdn}/reports",
+  $servername        = $::fqdn,
+  $serverssl_ciphers = undef,
+  $serverssl_protos  = undef,
+  $servertype        = 'unicorn',
+  $storeconfigs      = undef,
+  $stringify_facts   = false,
+  $package           = $puppet::params::master_package,
 ) inherits puppet::params {
 
   validate_bool($ca)

manifests/server/config.pp

@@ -10,32 +10,62 @@
   }
 
   if $puppet::server::directoryenvs == true {
-    validate_string($puppet::server::environmentpath)
-    validate_string($puppet::server::default_manifest)
+    if $puppet::server::environmentpath {
+      validate_string($puppet::server::environmentpath)
+      $environmentpath_ensure = 'present'
+    } else {
+      $environmentpath_ensure = 'absent'
+    }
 
-    $env_ensure              = 'present'
-    $basemod_ensure          = 'present'
-    $default_manifest_ensure = 'present'
+    if $puppet::server::basemodulepath {
+      $basemodulepath_ensure = 'present'
+    } else {
+      $basemodulepath_ensure = 'absent'
+    }
 
-    # Remove deprecated settings
-    $mod_ensure            = 'absent'
+    if $puppet::server::default_manifest {
+      validate_string($puppet::server::default_manifest)
+      $default_manifest_ensure = 'present'
+    } else {
+      $default_manifest_ensure = 'absent'
+    }
+    $manifest_ensure       = 'absent'
+    $modulepath_ensure     = 'absent'
+    $config_version_ensure = 'absent'
   } else {
-    $env_ensure              = 'absent'
-    $basemod_ensure          = 'absent'
-    $default_manifest_ensure = 'absent'
+    if $puppet::server::manifest {
+      validate_string($puppet::server::manifest)
+      $manifest_ensure = 'present'
+    } else {
+      $manifest_ensure = 'absent'
+    }
+
+    if $puppet::server::modulepath {
+      $modulepath_ensure = 'present'
+    } else {
+      $modulepath_ensure = 'absent'
+    }
+
+    if $puppet::server::config_version {
+      validate_string($puppet::server::config_version)
+      $config_version_ensure = 'present'
+    } else {
+      $config_version_ensure = 'absent'
+    }
 
-    # Leave deprecated settings in place
-    $mod_ensure            = 'present'
+    $environmentpath_ensure  = 'absent'
+    $basemodulepath_ensure   = 'absent'
+    $default_manifest_ensure = 'absent'
   }
 
   ini_setting {
     'environmentpath':
-      ensure  => $env_ensure,
+      ensure  => $environmentpath_ensure,
       setting => 'environmentpath',
       value   => $puppet::server::environmentpath;
 
     'basemodulepath':
-      ensure  => $basemod_ensure,
+      ensure  => $basemodulepath_ensure,
       setting => 'basemodulepath',
       value   => join(flatten([$puppet::server::basemodulepath]), ':');
 
@@ -45,15 +75,20 @@
       value   => $puppet::server::default_manifest;
 
     'modulepath':
-      ensure  => $mod_ensure,
+      ensure  => $modulepath_ensure,
       setting => 'modulepath',
       value   => join(flatten([$puppet::server::modulepath]), ':');
 
     'manifest':
-      ensure  => $mod_ensure,
+      ensure  => $manifest_ensure,
       setting => 'manifest',
       value   => $puppet::server::manifest;
 
+    'config_version':
+      ensure  => $config_version_ensure,
+      setting => 'config_version',
+      value   => $puppet::server::config_version;
+
     'user':
       setting => 'user',
       value   => $puppet::user;
@@ -79,14 +114,6 @@
     }
   }
 
-  if $puppet::server::config_version_cmd {
-    ini_setting { 'config_version':
-      ensure  => $mod_ensure,
-      setting => 'config_version',
-      value   => $puppet::server::config_version_cmd,
-    }
-  }
-
   if $puppet::server::ssl_client_header {
     ini_setting {
       'ssl_client_header':