Skip to content

Commit e6ce389

Browse files
committed
Eliminate params.pp
params.pp and Inheritance in general is not best Practice anymore. Hiera provides better Definition of Parameters. - move Defaultvalues to Modulelevel-Hiera - eliminate params.pp - specify Lookup-Options - sort YAML-Files alphabetically Attention: Parameter postfix::master_os_template still is without a Defaultvalue!
1 parent 86e5072 commit e6ce389

File tree

25 files changed

+237
-221
lines changed

25 files changed

+237
-221
lines changed

REFERENCE.md

Lines changed: 35 additions & 81 deletions
Large diffs are not rendered by default.

data/common.yaml

Lines changed: 85 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,86 @@
11
---
2-
postfix::params::aliasesseltype: ~
3-
postfix::params::seltype: ~
4-
postfix::params::mailx_package: 'mailx'
5-
postfix::params::restart_cmd: '/etc/init.d/postfix reload'
6-
...
2+
lookup_options:
3+
postfix::conffiles:
4+
merge: deep
5+
postfix::configs:
6+
merge: deep
7+
postfix::hashes:
8+
merge: deep
9+
postfix::ldap_packages:
10+
merge: unique
11+
postfix::mailaliases:
12+
merge: deep
13+
postfix::maps:
14+
merge: deep
15+
postfix::masquerade_classes:
16+
merge: unique
17+
postfix::masquerade_domains:
18+
merge: unique
19+
postfix::masquerade_exceptions:
20+
merge: unique
21+
postfix::master_entries:
22+
merge: unique
23+
postfix::mta::masquerade_classes:
24+
merge: unique
25+
postfix::mta::masquerade_domains:
26+
merge: unique
27+
postfix::mta::masquerade_exceptions:
28+
merge: unique
29+
postfix::root_mail_recipient:
30+
merge: first
31+
postfix::satellitemasquerade_classes:
32+
merge: unique
33+
postfix::satellitemasquerade_domains:
34+
merge: unique
35+
postfix::satellitemasquerade_exceptions:
36+
merge: unique
37+
postfix::smtp_listen:
38+
merge: unique
39+
postfix::transports:
40+
merge: deep
41+
postfix::virtuals:
42+
merge: deep
43+
postfix::alias_maps: hash:/etc/aliases
44+
postfix::amavis_procs: 2
45+
postfix::confdir: "/etc/postfix"
46+
postfix::conffiles: {}
47+
postfix::configs: {}
48+
postfix::hashes: {}
49+
postfix::inet_interfaces: all
50+
postfix::inet_protocols: all
51+
postfix::ldap: false
52+
postfix::ldap_packages: []
53+
postfix::lookup_table_type: hash
54+
postfix::mail_user: vmail
55+
postfix::mailaliases: {}
56+
postfix::mailman: false
57+
postfix::mailx_ensure: present
58+
postfix::mailx_package: mailx
59+
postfix::maincf_source: puppet:///modules/postfix/main.cf
60+
postfix::manage_aliases: true
61+
postfix::manage_conffiles: true
62+
postfix::manage_mailname: true
63+
postfix::manage_mailx: true
64+
postfix::manage_root_alias: true
65+
postfix::maps: {}
66+
postfix::master_bounce_command: bounce
67+
postfix::master_defer_command: bounce
68+
postfix::master_entries: []
69+
postfix::mta: false
70+
postfix::mydestination: "$myhostname, localhost.$mydomain, localhost"
71+
postfix::mynetworks: 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
72+
postfix::myorigin: "%{facts.networking.fqdn}"
73+
postfix::postfix_ensure: present
74+
postfix::restart_cmd: "/etc/init.d/postfix reload"
75+
postfix::root_group: root
76+
postfix::root_mail_recipient: nobody
77+
postfix::satellite: false
78+
postfix::service_enabled: true
79+
postfix::service_ensure: running
80+
postfix::smtp_listen: 127.0.0.1
81+
postfix::transports: {}
82+
postfix::use_amavisd: false
83+
postfix::use_dovecot_lda: false
84+
postfix::use_schleuder: false
85+
postfix::use_sympa: false
86+
postfix::virtuals: {}

data/os/Alpine.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
postfix::params::master_os_template: "postfix/master.cf.debian.erb"
2+
postfix::master_os_template: postfix/master.cf.debian.erb

data/os/FreeBSD.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
postfix::confdir: "/usr/local/etc/postfix"
33
postfix::manage_mailname: false
44
postfix::manage_mailx: false
5-
postfix::root_group: "wheel"
6-
postfix::params::master_os_template: "postfix/master.cf.FreeBSD.erb"
7-
postfix::params::restart_cmd: "/usr/local/etc/rc.d/postfix reload"
8-
...
5+
postfix::master_os_template: postfix/master.cf.FreeBSD.erb
6+
postfix::restart_cmd: "/usr/local/etc/rc.d/postfix reload"
7+
postfix::root_group: wheel

data/os/Solaris.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
postfix::params::master_os_template: "postfix/master.cf.Solaris.erb"
3-
postfix::params::restart_cmd: '/usr/sbin/svcadm refresh network/smtp:postfix'
4-
postfix::params::mailx_package: 'mailx'
5-
...
2+
postfix::mailx_package: mailx
3+
postfix::master_os_template: postfix/master.cf.Solaris.erb
4+
postfix::restart_cmd: "/usr/sbin/svcadm refresh network/smtp:postfix"

data/osfamily/Debian.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
postfix::params::mailx_package: 'bsd-mailx'
3-
postfix::params::master_os_template: 'postfix/master.cf.debian.erb'
4-
postfix::ldap_packages: ['postfix-ldap']
5-
...
2+
postfix::ldap_packages:
3+
- postfix-ldap
4+
postfix::mailx_package: bsd-mailx
5+
postfix::master_os_template: postfix/master.cf.debian.erb

data/osfamily/Debian/etch.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
---
2-
postfix::params::mailx_package: 'mailx'
3-
...
2+
postfix::mailx_package: mailx

data/osfamily/Debian/lenny.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
---
2-
postfix::params::mailx_package: 'mailx'
3-
...
2+
postfix::mailx_package: mailx

data/osfamily/Debian/sarge.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
---
2-
postfix::params::mailx_package: 'mailx'
3-
...
2+
postfix::mailx_package: mailx

data/osfamily/RedHat.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
2-
postfix::params::aliasesseltype: 'etc_aliases_t'
3-
postfix::params::seltype: 'postfix_etc_t'
4-
postfix::params::restart_cmd: '/bin/systemctl reload postfix'
5-
postfix::params::master_os_template: 'postfix/master.cf.redhat.erb'
6-
postfix::mta_bin_path: '/usr/sbin/sendmail.postfix'
7-
...
2+
postfix::aliasesseltype: etc_aliases_t
3+
postfix::master_os_template: postfix/master.cf.redhat.erb
4+
postfix::mta_bin_path: "/usr/sbin/sendmail.postfix"
5+
postfix::restart_cmd: "/bin/systemctl reload postfix"
6+
postfix::seltype: postfix_etc_t

0 commit comments

Comments
 (0)