From 2a9dbd931e095c933831edd19337607f5f356ae5 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 4 Dec 2012 22:36:34 -0500
Subject: remove no longer needed removal of the ports.conf file

---
 puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'puppet')

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',
-- 
cgit v1.2.3