diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-03-02 15:34:34 +0000 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-03-02 15:34:34 +0000 |
| commit | 093b7701167304a28d31db7a45c51bba09e5a10a (patch) | |
| tree | 0174d2873240a4a71ee235bdd4590e6b71e8a9ce | |
| parent | 877134184b26c0ff326d46ff332f287d9e8a1be1 (diff) | |
| parent | a61349e001b807f23eea3e4d7d97cd9c83fcd6f9 (diff) | |
| download | puppet-postfix-093b7701167304a28d31db7a45c51bba09e5a10a.tar.gz puppet-postfix-093b7701167304a28d31db7a45c51bba09e5a10a.tar.bz2 | |
Merge branch 'fix-module_dir-usage' into 'master'
Fix module_dir usage
Change "module_dir" definitions to "common::module_dir".
See merge request !2
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | manifests/tlspolicy.pp | 2 | ||||
| -rw-r--r-- | manifests/transport_regexp.pp | 2 | ||||
| -rw-r--r-- | manifests/virtual_regexp.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 3d51bb1..f454be9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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' { diff --git a/manifests/tlspolicy.pp b/manifests/tlspolicy.pp index e1272b9..d901710 100644 --- a/manifests/tlspolicy.pp +++ b/manifests/tlspolicy.pp @@ -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" diff --git a/manifests/transport_regexp.pp b/manifests/transport_regexp.pp index eaa78da..4961141 100644 --- a/manifests/transport_regexp.pp +++ b/manifests/transport_regexp.pp @@ -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" diff --git a/manifests/virtual_regexp.pp b/manifests/virtual_regexp.pp index af68ec6..18bbd8c 100644 --- a/manifests/virtual_regexp.pp +++ b/manifests/virtual_regexp.pp @@ -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" |