summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-11-03 11:43:58 +0100
committervarac <varacanero@zeromail.org>2012-11-03 11:43:58 +0100
commit5981a73edce0a64f26bb8abb799c180b856abbbd (patch)
tree7858e4fc5f78a3b15f761156c3eba973c9805799
parent5493d362f7b3abd6c8aa9350341a551c53622604 (diff)
overwrite /etc/apache2/ports.conf so 0-default.conf and 0-default_ssl.conf don't start on port 80/443
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp20
1 files changed, 14 insertions, 6 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index b296279c..4c923b35 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -16,12 +16,20 @@ class site_couchdb {
# key => $key,
# cert => $cert,
#}
-
+
include apache::ssl
- apache::module {
- 'rewrite': ensure => present;
- 'proxy': ensure => present;
- 'proxy_http': ensure => present;
- }
+ apache::module {
+ 'rewrite': ensure => present;
+ 'proxy': ensure => present;
+ 'proxy_http': ensure => present;
+ }
apache::vhost::file { 'couchdb_proxy': }
+ # prevent 0-default.conf and 0-default_ssl.conf from apache module
+ # from starting on port 80 / 443
+ file { '/etc/apache2/ports.conf':
+ content => '',
+ mode => '0644',
+ owner => 'root',
+ group => 'root',
+ }
}