From 92f565f349266f7c5adfc88b31d0d2902431efa4 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 10 Apr 2013 12:27:39 -0400
Subject: clean up ca_daemon things, it is not used any longer because it has
 been included in the web app (#1978) remove site_ca_daemon module and
 configuration in site.pp as well as the provider_base/services/ca.json

---
 puppet/modules/site_ca_daemon/manifests/apache.pp | 62 -----------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 puppet/modules/site_ca_daemon/manifests/apache.pp

(limited to 'puppet/modules/site_ca_daemon/manifests/apache.pp')

diff --git a/puppet/modules/site_ca_daemon/manifests/apache.pp b/puppet/modules/site_ca_daemon/manifests/apache.pp
deleted file mode 100644
index ab6b08fd..00000000
--- a/puppet/modules/site_ca_daemon/manifests/apache.pp
+++ /dev/null
@@ -1,62 +0,0 @@
-class site_ca_daemon::apache {
-
-  $api_domain       = hiera('api_domain')
-  $x509             = hiera('x509')
-  $commercial_key   = $x509['commercial_key']
-  $commercial_cert  = $x509['commercial_cert']
-  $commercial_root  = $x509['commercial_ca_cert']
-  $api_key          = $x509['key']
-  $api_cert         = $x509['cert']
-  $api_root         = $x509['ca_cert']
-
-  $apache_no_default_site = true
-  include apache::ssl
-
-  apache::module {
-    'alias':   ensure => present;
-    'rewrite': ensure => present;
-    'headers': ensure => present;
-  }
-
-  class { 'passenger': use_munin => false }
-
-  apache::vhost::file {
-    'leap_ca_daemon':
-      content => template('site_apache/vhosts.d/leap_ca_daemon.conf.erb')
-  }
-
-  apache::vhost::file {
-    'api':
-      content => template('site_apache/vhosts.d/api.conf.erb')
-  }
-
-  x509::key {
-    'leap_ca_daemon':
-      content => $commercial_key,
-      notify  => Service[apache];
-
-    'leap_api':
-      content => $api_key,
-      notify  => Service[apache];
-  }
-
-  x509::cert {
-    'leap_ca_daemon':
-      content => $commercial_cert,
-      notify  => Service[apache];
-
-    'leap_api':
-      content => $api_cert,
-      notify  => Service[apache];
-  }
-
-  x509::ca {
-    'leap_ca_daemon':
-      content => $commercial_root,
-      notify  => Service[apache];
-
-    'leap_api':
-      content => $api_root,
-      notify  => Service[apache];
-  }
-}
-- 
cgit v1.2.3