Skip to content

Commit e105b2f

Browse files
bastelfreakbastelfreak
authored
Merge pull request #305 from jkroepke/data_in_modules
Data in Modules, Modern facts & Cleanup
2 parents 139c727 + 97f2cb3 commit e105b2f

28 files changed

+249
-212
lines changed

‎.sync.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
.travis.yml:
33
docker_sets:
4+
- set: ubuntu1804-64
45
- set: ubuntu1604-64
56
- set: ubuntu1404-64
67
- set: centos7-64

‎.travis.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,24 @@ matrix:
2525
- rvm: 2.4.4
2626
bundler_args: --without system_tests development release
2727
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
28+
- rvm: 2.5.1
29+
bundler_args: --without development release
30+
dist: trusty
31+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64{hypervisor=docker} CHECK=beaker
32+
services: docker
33+
sudo: required
34+
- rvm: 2.5.1
35+
bundler_args: --without development release
36+
dist: trusty
37+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64{hypervisor=docker} CHECK=beaker
38+
services: docker
39+
sudo: required
40+
- rvm: 2.5.1
41+
bundler_args: --without development release
42+
dist: trusty
43+
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
44+
services: docker
45+
sudo: required
2846
- rvm: 2.5.1
2947
bundler_args: --without development release
3048
dist: trusty

‎data/defaults.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
openvpn::autostart_all: true
2+
openvpn::manage_service: true
3+
openvpn::etc_directory: '/etc'
4+
openvpn::group: 'nobody'
5+
openvpn::link_openssl_cnf: true
6+
openvpn::pam_module_path: ~
7+
openvpn::namespecific_rclink: false
8+
openvpn::default_easyrsa_ver: '2.0'
9+
openvpn::easyrsa_source: '/usr/share/easy-rsa/'
10+
openvpn::additional_packages: ['easy-rsa']
11+
openvpn::ldap_auth_plugin_location: ~
12+
13+
openvpn::deploy::prepare::etc_directory: "%{alias('openvpn::etc_directory')}"

‎data/family/Archlinux.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
openvpn::default_easyrsa_ver: '3.0'
2+
openvpn::etc_directory: '/etc'
3+
openvpn::additional_packages: ['easy-rsa']
4+
openvpn::easyrsa_source: '/usr/share/easy-rsa/'
5+
openvpn::group: 'nobody'
6+
openvpn::ldap_auth_plugin_location: ~
7+
openvpn::pam_module_path: ~
8+
openvpn::link_openssl_cnf: true
9+
openvpn::namespecific_rclink: false

‎data/family/Debian.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
openvpn::etc_directory: '/etc'
2+
openvpn::group: 'nogroup'
3+
openvpn::link_openssl_cnf: true
4+
openvpn::namespecific_rclink: false
5+
openvpn::default_easyrsa_ver: '2.0'
6+
openvpn::additional_packages: ['easy-rsa','openvpn-auth-ldap']
7+
openvpn::easyrsa_source: '/usr/share/easy-rsa/'
8+
openvpn::ldap_auth_plugin_location: '/usr/lib/openvpn/openvpn-auth-ldap.so'
9+
openvpn::pam_module_path: '/usr/lib/openvpn/openvpn-plugin-auth-pam.so'

‎data/family/FreeBSD.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
openvpn::etc_directory: '/usr/local/etc'
2+
openvpn::group: 'nogroup'
3+
openvpn::link_openssl_cnf: true
4+
openvpn::pam_module_path: '/usr/local/lib/openvpn/openvpn-auth-pam.so'
5+
openvpn::additional_packages: ['easy-rsa2']
6+
openvpn::easyrsa_source: '/usr/local/share/easy-rsa'
7+
openvpn::default_easyrsa_ver: '2.0'
8+
openvpn::namespecific_rclink: true

‎data/family/RedHat.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
openvpn::etc_directory: '/etc'
2+
openvpn::group: 'nobody'
3+
openvpn::link_openssl_cnf: true
4+
openvpn::pam_module_path: '/usr/lib64/openvpn/plugin/lib/openvpn-auth-pam.so'
5+
openvpn::namespecific_rclink: false
6+
openvpn::default_easyrsa_ver: '3.0'
7+
openvpn::easyrsa_source: '/usr/share/easy-rsa/3'

‎data/family/RedHat/6.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
openvpn::additional_packages: ['easy-rsa','openvpn-auth-ldap']
2+
openvpn::ldap_auth_plugin_location: '/usr/lib64/openvpn/plugin/lib/openvpn-auth-ldap.so'

‎data/family/RedHat/7.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
openvpn::additional_packages: ['easy-rsa']
2+
openvpn::ldap_auth_plugin_location: ~

‎hiera.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
version: 5
3+
4+
defaults:
5+
datadir: 'data'
6+
data_hash: yaml_data
7+
8+
hierarchy:
9+
- name: 'OS Major Release Overrides'
10+
path: "family/%{facts.os.family}/%{facts.os.release.major}.yaml"
11+
- name: 'Operating System'
12+
path: "os/%{facts.os.name}.yaml"
13+
- name: 'Operating System Family'
14+
path: "family/%{facts.os.family}.yaml"
15+
- name: 'Defaults'
16+
path: 'defaults.yaml'

0 commit comments

Comments
 (0)