summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2020-05-13 23:06:53 +0200
committerJan Dittberner <jandd@cacert.org>2020-05-13 23:06:53 +0200
commit2acad807b0d4748a33495a293c7cb88fa4dcb0d3 (patch)
tree143a6cffe472c2722b0fbb6e3adfb80572507555
parent4fbcef8f2ae6a9f747d90249af90a76ce6e798f9 (diff)
downloadcacert-puppet-2acad807b0d4748a33495a293c7cb88fa4dcb0d3.tar.gz
cacert-puppet-2acad807b0d4748a33495a293c7cb88fa4dcb0d3.tar.xz
cacert-puppet-2acad807b0d4748a33495a293c7cb88fa4dcb0d3.zip
Fix duplicate class definition
-rw-r--r--sitemodules/profiles/manifests/apache_common.pp1
-rw-r--r--sitemodules/profiles/manifests/roundcube.pp4
2 files changed, 1 insertions, 4 deletions
diff --git a/sitemodules/profiles/manifests/apache_common.pp b/sitemodules/profiles/manifests/apache_common.pp
index 4a94f80..824947a 100644
--- a/sitemodules/profiles/manifests/apache_common.pp
+++ b/sitemodules/profiles/manifests/apache_common.pp
@@ -25,5 +25,6 @@ class profiles::apache_common (
) {
class { 'apache':
default_vhost => false,
+ default_ssl_vhost => false,
}
}
diff --git a/sitemodules/profiles/manifests/roundcube.pp b/sitemodules/profiles/manifests/roundcube.pp
index 2249488..15f1bb1 100644
--- a/sitemodules/profiles/manifests/roundcube.pp
+++ b/sitemodules/profiles/manifests/roundcube.pp
@@ -236,10 +236,6 @@ class profiles::roundcube (
require => File['/etc/apache2/ssl/private'],
}
- class { 'apache':
- default_vhost => false,
- default_ssl_vhost => false,
- }
class { 'apache::mod::php': }
apache::vhost { "${external_name}-http":
vhost_name => '*',