From 5981a73edce0a64f26bb8abb799c180b856abbbd Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 3 Nov 2012 11:43:58 +0100 Subject: overwrite /etc/apache2/ports.conf so 0-default.conf and 0-default_ssl.conf don't start on port 80/443 --- puppet/modules/site_couchdb/manifests/init.pp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'puppet/modules') 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', + } } -- cgit v1.2.3