summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-12-04 22:36:34 -0500
committerMicah Anderson <micah@riseup.net>2012-12-04 22:36:34 -0500
commit2a9dbd931e095c933831edd19337607f5f356ae5 (patch)
tree4c1f85ab462bb415f2feab6812a8c83192817a48
parent8b7ca862253b1212ae392c58099df9b6feaa0ca2 (diff)
remove no longer needed removal of the ports.conf file
-rw-r--r--puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp8
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
index a2ca9618..fb3477db 100644
--- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
+++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
@@ -9,14 +9,6 @@ define site_couchdb::apache_ssl_proxy ($key, $cert) {
'ssl': 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',
- }
file { '/etc/couchdb/server_cert.pem':
mode => '0644',