opuppet/module-postfix
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'fix-module_dir-usage' into 'master'

Browse source 
Fix module_dir usage

Change "module_dir" definitions to "common::module_dir".

See merge request !2
This commit is contained in:
Jerome Charaoui 2015-03-02 15:34:34 +00:00
commit 093b770116
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/init.pp
View file

@ -74,7 +74,7 @@ class postfix(
# Bootstrap moduledir
include common::moduledir
module_dir{'postfix': }
common::module_dir{'postfix': }
# Include optional classes
if $anon_sasl == 'yes' {

2
manifests/tlspolicy.pp
View file

@ -16,7 +16,7 @@ class postfix::tlspolicy(
) {
include common::moduledir
module_dir{'postfix/tls_policy': }
common::module_dir{'postfix/tls_policy': }
$postfix_tlspolicy_dir = "${common::moduledir::module_dir_path}/postfix/tls_policy"
$postfix_merged_tlspolicy = "${postfix_tlspolicy_dir}/merged_tls_policy"

2
manifests/transport_regexp.pp
View file

@ -22,7 +22,7 @@
class postfix::transport_regexp {
include common::moduledir
module_dir{'postfix/transport_regexp': }
common::module_dir{'postfix/transport_regexp': }
$postfix_transport_regexp_dir = "${common::moduledir::module_dir_path}/postfix/transport_regexp"
$postfix_transport_regexp_snippets_dir = "${postfix_transport_regexp_dir}/transport_regexp.d"

2
manifests/virtual_regexp.pp
View file

@ -22,7 +22,7 @@
class postfix::virtual_regexp {
include common::moduledir
module_dir{'postfix/virtual_regexp': }
common::module_dir{'postfix/virtual_regexp': }
$postfix_virtual_regexp_dir = "${common::moduledir::module_dir_path}/postfix/virtual_regexp"
$postfix_virtual_regexp_snippets_dir = "${postfix_virtual_regexp_dir}/virtual_regexp.d"