Data in Modules, Modern facts & Cleanup

.sync.yml

@@ -1,6 +1,7 @@
 ---
 .travis.yml:
   docker_sets:
+    - set: ubuntu1804-64
     - set: ubuntu1604-64
     - set: ubuntu1404-64
     - set: centos7-64

.travis.yml

@@ -25,6 +25,24 @@ matrix:
   - rvm: 2.4.4
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
+  - rvm: 2.5.1
+    bundler_args: --without development release
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64{hypervisor=docker} CHECK=beaker
+    services: docker
+    sudo: required
+  - rvm: 2.5.1
+    bundler_args: --without development release
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64{hypervisor=docker} CHECK=beaker
+    services: docker
+    sudo: required
+  - rvm: 2.5.1
+    bundler_args: --without development release
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-64{hypervisor=docker} CHECK=beaker
+    services: docker
+    sudo: required
   - rvm: 2.5.1
     bundler_args: --without development release
     dist: trusty

data/defaults.yaml

@@ -0,0 +1,13 @@
+openvpn::autostart_all: true
+openvpn::manage_service: true
+openvpn::etc_directory: '/etc'
+openvpn::group: 'nobody'
+openvpn::link_openssl_cnf: true
+openvpn::pam_module_path: ~
+openvpn::namespecific_rclink: false
+openvpn::default_easyrsa_ver: '2.0'
+openvpn::easyrsa_source: '/usr/share/easy-rsa/'
+openvpn::additional_packages: ['easy-rsa']
+openvpn::ldap_auth_plugin_location: ~
+
+openvpn::deploy::prepare::etc_directory: "%{alias('openvpn::etc_directory')}"

data/family/Archlinux.yaml

@@ -0,0 +1,9 @@
+openvpn::default_easyrsa_ver: '3.0'
+openvpn::etc_directory: '/etc'
+openvpn::additional_packages: ['easy-rsa']
+openvpn::easyrsa_source: '/usr/share/easy-rsa/'
+openvpn::group: 'nobody'
+openvpn::ldap_auth_plugin_location: ~
+openvpn::pam_module_path: ~
+openvpn::link_openssl_cnf: true
+openvpn::namespecific_rclink: false

data/family/Debian.yaml

@@ -0,0 +1,9 @@
+openvpn::etc_directory: '/etc'
+openvpn::group: 'nogroup'
+openvpn::link_openssl_cnf: true
+openvpn::namespecific_rclink: false
+openvpn::default_easyrsa_ver: '2.0'
+openvpn::additional_packages: ['easy-rsa','openvpn-auth-ldap']
+openvpn::easyrsa_source: '/usr/share/easy-rsa/'
+openvpn::ldap_auth_plugin_location: '/usr/lib/openvpn/openvpn-auth-ldap.so'
+openvpn::pam_module_path: '/usr/lib/openvpn/openvpn-plugin-auth-pam.so'

data/family/FreeBSD.yaml

@@ -0,0 +1,8 @@
+openvpn::etc_directory: '/usr/local/etc'
+openvpn::group: 'nogroup'
+openvpn::link_openssl_cnf: true
+openvpn::pam_module_path: '/usr/local/lib/openvpn/openvpn-auth-pam.so'
+openvpn::additional_packages: ['easy-rsa2']
+openvpn::easyrsa_source: '/usr/local/share/easy-rsa'
+openvpn::default_easyrsa_ver: '2.0'
+openvpn::namespecific_rclink: true

data/family/RedHat.yaml

@@ -0,0 +1,7 @@
+openvpn::etc_directory: '/etc'
+openvpn::group: 'nobody'
+openvpn::link_openssl_cnf: true
+openvpn::pam_module_path: '/usr/lib64/openvpn/plugin/lib/openvpn-auth-pam.so'
+openvpn::namespecific_rclink: false
+openvpn::default_easyrsa_ver: '3.0'
+openvpn::easyrsa_source: '/usr/share/easy-rsa/3'

data/family/RedHat/6.yaml

@@ -0,0 +1,2 @@
+openvpn::additional_packages: ['easy-rsa','openvpn-auth-ldap']
+openvpn::ldap_auth_plugin_location: '/usr/lib64/openvpn/plugin/lib/openvpn-auth-ldap.so'

data/family/RedHat/7.yaml

@@ -0,0 +1,2 @@
+openvpn::additional_packages: ['easy-rsa']
+openvpn::ldap_auth_plugin_location: ~

hiera.yaml

@@ -0,0 +1,16 @@
+---
+version: 5
+
+defaults:
+  datadir: 'data'
+  data_hash: yaml_data
+
+hierarchy:
+  - name: 'OS Major Release Overrides'
+    path: "family/%{facts.os.family}/%{facts.os.release.major}.yaml"
+  - name: 'Operating System'
+    path: "os/%{facts.os.name}.yaml"
+  - name: 'Operating System Family'
+    path: "family/%{facts.os.family}.yaml"
+  - name: 'Defaults'
+    path: 'defaults.yaml'

manifests/ca.pp

@@ -25,7 +25,7 @@
 #
 # [*group*]
 #   String.  User to drop privileges to after startup
-#   Default: depends on your $::osfamily
+#   Default: depends on your $facts['os']['family']
 #
 # [*ssl_key_size*]
 #   String. Length of SSL keys (in bits) generated by this module.
@@ -109,15 +109,15 @@
 
   include openvpn
   $group_to_set = $group ? {
-    undef   => $openvpn::params::group,
+    undef   => $openvpn::group,
     default => $group
   }
 
   File {
     group => $group_to_set,
   }
 
-  $etc_directory = $::openvpn::params::etc_directory
+  $etc_directory = $openvpn::etc_directory
 
   ensure_resource('file', "${etc_directory}/openvpn/${name}", {
     ensure => directory,
@@ -130,7 +130,7 @@
     links              => 'follow',
     source_permissions => 'use',
     group              => 0,
-    source             => "file:${openvpn::params::easyrsa_source}",
+    source             => "file:${openvpn::easyrsa_source}",
     require            => File["${etc_directory}/openvpn/${name}"],
   }
 
@@ -141,7 +141,7 @@
     require => File["${etc_directory}/openvpn/${name}/easy-rsa"],
   }
 
-  case $openvpn::params::easyrsa_version {
+  case $openvpn::easyrsa_version {
     '2.0': {
       file { "${etc_directory}/openvpn/${name}/easy-rsa/vars":
         ensure  => file,
@@ -150,7 +150,7 @@
         require => File["${etc_directory}/openvpn/${name}/easy-rsa"],
       }
 
-      if $openvpn::params::link_openssl_cnf == true {
+      if $openvpn::link_openssl_cnf {
         File["${etc_directory}/openvpn/${name}/easy-rsa/openssl.cnf"] {
           ensure => link,
           target => "${etc_directory}/openvpn/${name}/easy-rsa/openssl-1.0.0.cnf",
@@ -216,7 +216,7 @@
         require => File["${etc_directory}/openvpn/${name}/easy-rsa"],
       }
 
-      if $openvpn::params::link_openssl_cnf == true {
+      if $openvpn::link_openssl_cnf {
         File["${etc_directory}/openvpn/${name}/easy-rsa/openssl.cnf"] {
           ensure => link,
           target => "${etc_directory}/openvpn/${name}/easy-rsa/openssl-1.0.cnf",
@@ -264,7 +264,7 @@
 
     }
     default: {
-      fail("unexepected value for EasyRSA version, got '${openvpn::params::easyrsa_version}', expect 2.0 or 3.0.")
+      fail("unexepected value for EasyRSA version, got '${openvpn::easyrsa_version}', expect 2.0 or 3.0.")
     }
   }
 

manifests/client.pp

@@ -244,7 +244,7 @@
   Openvpn::Ca[$ca_name]
   -> Openvpn::Client[$name]
 
-  $etc_directory = $::openvpn::params::etc_directory
+  $etc_directory = $openvpn::etc_directory
 
   if $expire {
     if is_integer($expire) {
@@ -256,7 +256,7 @@
     $env_expire = ''
   }
 
-  case $openvpn::params::easyrsa_version {
+  case $openvpn::easyrsa_version {
     '2.0': {
       exec { "generate certificate for ${name} in context of ${ca_name}":
         command  => ". ./vars && ${env_expire} ./pkitool ${name}",
@@ -298,7 +298,7 @@
       }
     }
     default: {
-      fail("unexepected value for EasyRSA version, got '${openvpn::params::easyrsa_version}', expect 2.0 or 3.0.")
+      fail("unexepected value for EasyRSA version, got '${openvpn::easyrsa_version}', expect 2.0 or 3.0.")
     }
   }
 
@@ -354,7 +354,7 @@
 
   file { "${etc_directory}/openvpn/${server}/download-configs/${name}/${name}.conf":
     owner   => root,
-    group   => $::openvpn::params::root_group,
+    group   => 0,
     mode    => '0444',
     content => template('openvpn/client.erb', 'openvpn/client_external_auth.erb'),
   }

manifests/client_specific_config.pp

@@ -91,7 +91,7 @@
   -> Openvpn::Client[$name]
   -> Openvpn::Client_specific_config[$name]
 
-  file { "${::openvpn::params::etc_directory}/openvpn/${server}/client-configs/${name}":
+  file { "${openvpn::etc_directory}/openvpn/${server}/client-configs/${name}":
     ensure  => $ensure,
     content => template('openvpn/client_specific_config.erb'),
   }

manifests/config.pp

@@ -29,12 +29,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-class openvpn::config inherits openvpn::params {
+class openvpn::config {
 
-  if $::osfamily == 'Debian' {
+  if $facts['osfamily'] == 'Debian' {
     concat { '/etc/default/openvpn':
       owner => root,
-      group => $openvpn::params::root_group,
+      group => 0,
       mode  => '0644',
       warn  => true,
     }

manifests/deploy/client.pp

@@ -38,15 +38,15 @@
 
   if $manage_etc {
     file { [
-      "${::openvpn::params::etc_directory}/openvpn",
-      "${::openvpn::params::etc_directory}/openvpn/keys",
-      "${::openvpn::params::etc_directory}/openvpn/keys/${name}",
+      "${openvpn::deploy::prepare::etc_directory}/openvpn",
+      "${openvpn::deploy::prepare::etc_directory}/openvpn/keys",
+      "${openvpn::deploy::prepare::etc_directory}/openvpn/keys/${name}",
     ]:
       ensure  => directory,
       require => Package['openvpn'];
     }
   } else {
-    file { "${::openvpn::params::etc_directory}/openvpn/keys/${name}":
+    file { "${openvpn::deploy::prepare::etc_directory}/openvpn/keys/${name}":
       ensure  => directory,
       require => Package['openvpn'];
     }

manifests/deploy/export.pp

@@ -40,7 +40,7 @@
 
       @@file { "exported-${server}-${name}-config":
         ensure  => file,
-        path    => "${::openvpn::params::etc_directory}/openvpn/${name}.conf",
+        path    => "${openvpn::etc_directory}/openvpn/${name}.conf",
         owner   => 'root',
         group   => 'root',
         mode    => '0600',
@@ -50,7 +50,7 @@
 
       @@file { "exported-${server}-${name}-ca":
         ensure  => file,
-        path    => "${::openvpn::params::etc_directory}/openvpn/keys/${name}/ca.crt",
+        path    => "${openvpn::etc_directory}/openvpn/keys/${name}/ca.crt",
         owner   => 'root',
         group   => 'root',
         mode    => '0600',
@@ -60,7 +60,7 @@
 
       @@file { "exported-${server}-${name}-crt":
         ensure  => file,
-        path    => "${::openvpn::params::etc_directory}/openvpn/keys/${name}/${name}.crt",
+        path    => "${openvpn::etc_directory}/openvpn/keys/${name}/${name}.crt",
         owner   => 'root',
         group   => 'root',
         mode    => '0600',
@@ -70,7 +70,7 @@
 
       @@file { "exported-${server}-${name}-key":
         ensure  => file,
-        path    => "${::openvpn::params::etc_directory}/openvpn/keys/${name}/${name}.key",
+        path    => "${openvpn::etc_directory}/openvpn/keys/${name}/${name}.key",
         owner   => 'root',
         group   => 'root',
         mode    => '0600',
@@ -81,7 +81,7 @@
       if $tls_auth {
         @@file { "exported-${server}-${name}-ta":
           ensure  => file,
-          path    => "${::openvpn::params::etc_directory}/openvpn/keys/${name}/ta.key",
+          path    => "${openvpn::etc_directory}/openvpn/keys/${name}/ta.key",
           owner   => 'root',
           group   => 'root',
           mode    => '0600',

manifests/deploy/prepare.pp

@@ -4,7 +4,9 @@
 #
 # === Parameters
 #
-# None
+# [*etc_directory*]
+#   String. Path of the configuration directory.
+#   Default: /etc
 #
 # === Variables
 #
@@ -19,9 +21,9 @@
 # Phil Bayfield https://bitbucket.org/Philio/
 #
 
-class openvpn::deploy::prepare {
-
-  class { 'openvpn::params': }
+class openvpn::deploy::prepare(
+  Stdlib::Absolutepath $etc_directory
+) {
 
   class { 'openvpn::deploy::install': }
   ~> class { 'openvpn::deploy::service': }