diff options
| author | varac <varacanero@zeromail.org> | 2013-09-17 16:43:20 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-17 16:43:20 +0200 |
| commit | 5f87fcd074480cdc448e23cb78386377cc19e90b (patch) | |
| tree | 5dc28b574d01d5cb07f06640d142abf8da99dac0 /puppet/modules/site_config/manifests/default.pp | |
| parent | 70284fd0e786ad838fbbd40c816f6c0d01cc1629 (diff) | |
| parent | 3e5e685200e9b5c3ac8567100e552929ea55d8e8 (diff) | |
Merge branch 'feature/3817_3836_3837_Duplicate_declarations' into develop
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index 0a4e75b6..b315044a 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -55,4 +55,6 @@ class site_config::default { include site_squid_deb_proxy::client } + include site_config::x509 + } |