Better handling for the config_directory parameter.

As suggested by @smortex.

data/common.yaml

@@ -61,7 +61,7 @@ prosody::user: prosody
 prosody::virtualhost_defaults: {}
 prosody::virtualhosts: {}
 
-prosody::config::config_directory: '/etc/prosody'
+prosody::config_directory: '/etc/prosody'
 
 prosody::community_modules::ensure: present
 prosody::community_modules::path: /var/lib/prosody/modules

data/os/Gentoo.yaml

@@ -5,7 +5,7 @@ prosody::info_log: /var/log/jabber/prosody.log
 prosody::pidfile: /run/jabber/prosody.pid
 prosody::user: jabber
 
-prosody::config::config_directory: '/etc/jabber'
+prosody::config_directory: '/etc/jabber'
 
 prosody::community_modules::ensure: present
 prosody::community_modules::path: /usr/lib64/prosody/community-modules

manifests/config.pp

@@ -1,16 +1,14 @@
 # == Class: prosody::config
-class prosody::config (
-  Stdlib::Absolutepath  $config_directory,
-) {
-  file { "${config_directory}/conf.avail":
+class prosody::config {
+  file { "${prosody::config_directory}/conf.avail":
     ensure => directory,
   }
 
-  file { "${config_directory}/conf.d":
+  file { "${prosody::config_directory}/conf.d":
     ensure => directory,
   }
 
-  file { "${config_directory}/prosody.cfg.lua":
+  file { "${prosody::config_directory}/prosody.cfg.lua":
     content => template('prosody/prosody.cfg.erb'),
     require => Class['prosody::package'],
     notify  => Class['prosody::service'],

manifests/init.pp

@@ -43,6 +43,7 @@
   Optional[Stdlib::Absolutepath] $ssl_cert = undef,
   Optional[Stdlib::Absolutepath] $ssl_key = undef,
   Optional[String] $ssl_protocol = undef,
+  Optional[Stdlib::Absolutepath] $config_directory = undef,
 ) {
   if ($community_modules != []) {
     class { 'prosody::community_modules':

manifests/virtualhost.pp

@@ -9,7 +9,6 @@
   Optional[String]               $group            = undef,
   Hash                           $components       = {},
   Array[String[1]]               $disco_items      = [],
-  Stdlib::Absolutepath           $config_directory = lookup('prosody::config::config_directory'),
 ) {
   # Check if SSL set correctly
   if (($ssl_key != undef) and ($ssl_cert == undef)) {
@@ -21,8 +20,8 @@
 
   if (($ssl_key != undef) and ($ssl_cert != undef) and ($ssl_copy == true)) {
     # Copy the provided sources to prosody certs folder
-    $prosody_ssl_key  = "${config_directory}/certs/${name}.key"
-    $prosody_ssl_cert = "${config_directory}/certs/${name}.crt"
+    $prosody_ssl_key  = "${prosody::config_directory}/certs/${name}.key"
+    $prosody_ssl_cert = "${prosody::config_directory}/certs/${name}.crt"
 
     $file_user = pick_default($user, 'prosody')
     $file_group = pick_default($group, 'prosody')
@@ -54,7 +53,7 @@
     $config_requires = Class['prosody::package']
   }
 
-  $conf_avail_fn = "${config_directory}/conf.avail/${name}.cfg.lua"
+  $conf_avail_fn = "${prosody::config_directory}/conf.avail/${name}.cfg.lua"
 
   file { $conf_avail_fn:
     ensure  => $ensure,
@@ -68,7 +67,7 @@
     'absent'  => absent,
   }
 
-  file { "${config_directory}/conf.d/${name}.cfg.lua":
+  file { "${prosody::config_directory}/conf.d/${name}.cfg.lua":
     ensure  => $cfg_ensure,
     target  => $conf_avail_fn,
     notify  => Class['prosody::service'],