From c228491af3929e07766903c3ce29a06fab86ad63 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 4 Apr 2013 12:08:55 -0400
Subject: remove the apache_ssl_proxy cleanup

---
 puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 13 -------------
 puppet/modules/site_couchdb/manifests/init.pp             |  6 ++----
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp

(limited to 'puppet/modules')

diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
deleted file mode 100644
index 536dd8db..00000000
--- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class site_couchdb::apache_ssl_proxy {
-
-# This is here to disable the previously configured apache ssl proxy
-# we were using this, but have switched to stunnel instead.
-#
-# Unfortunately, the current apache shared module doesn't handle
-# ensure=>absent, so this is going to be done the crude way, and will only
-# work for debian+derivitives, which is fine for now, but not good for the
-# future
-
-  package { 'apache2': ensure => absent }
-
-}
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index e0f379cd..0fc951c2 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -5,6 +5,7 @@ class site_couchdb ( $bigcouch = false ) {
   $key                    = $x509['key']
   $cert                   = $x509['cert']
   $ca                     = $x509['ca_cert']
+
   $couchdb_config         = hiera('couch')
   $couchdb_users          = $couchdb_config['users']
   $couchdb_admin          = $couchdb_users['admin']
@@ -16,6 +17,7 @@ class site_couchdb ( $bigcouch = false ) {
   $couchdb_ca_daemon      = $couchdb_users['ca_daemon']
   $couchdb_ca_daemon_user = $couchdb_ca_daemon['username']
   $couchdb_ca_daemon_pw   = $couchdb_ca_daemon['password']
+
   $bigcouch_config        = $couchdb_config['bigcouch']
   $bigcouch_cookie        = $bigcouch_config['cookie']
 
@@ -32,10 +34,6 @@ class site_couchdb ( $bigcouch = false ) {
     -> Couchdb::Add_user[$couchdb_webapp_user]
     -> Couchdb::Add_user[$couchdb_ca_daemon_user]
 
-  # this is here to disable and remove the proxy
-  include site_couchdb::apache_ssl_proxy
-
-  # the above apache_ssl_proxy is replaced by the following stunnel
   class { 'site_couchdb::stunnel':
     key  => $key,
     cert => $cert,
-- 
cgit v1.2.3