From 14a7154254dc50dc27c8b7d2b95bd9321782baf7 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Sun, 21 Oct 2012 09:11:16 -0700
Subject: [PATCH] Correct etherpad lite certificates.

Etherpad lite previously attempted to manage its cert files in two
different ways. This created a conflict and puppet would not run
successfully. Remove the old way of managing the cert files.

Change-Id: I9336c6f97d455917f4680bfdfd5543283714fe34
Reviewed-on: https://review.openstack.org/14584
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
---
 modules/etherpad_lite/manifests/apache.pp     | 23 -------------------
 .../etherpad_lite/templates/eplite.crt.erb    |  1 -
 .../etherpad_lite/templates/eplite.key.erb    |  1 -
 3 files changed, 25 deletions(-)
 delete mode 100644 modules/etherpad_lite/templates/eplite.crt.erb
 delete mode 100644 modules/etherpad_lite/templates/eplite.key.erb

diff --git a/modules/etherpad_lite/manifests/apache.pp b/modules/etherpad_lite/manifests/apache.pp
index 9152b106bc..6e0f485377 100644
--- a/modules/etherpad_lite/manifests/apache.pp
+++ b/modules/etherpad_lite/manifests/apache.pp
@@ -13,8 +13,6 @@ class etherpad_lite::apache (
     docroot => 'MEANINGLESS ARGUMENT',
     priority => '50',
     template => 'etherpad_lite/etherpadlite.vhost.erb',
-    require => File["/etc/ssl/certs/${vhost_name}.pem",
-                    "/etc/ssl/private/${vhost_name}.key"],
     ssl => true,
   }
   a2mod { 'rewrite':
@@ -39,25 +37,6 @@ class etherpad_lite::apache (
     mode   => 0700,
   }
 
-  file { "/etc/ssl/certs/${vhost_name}.pem":
-    ensure  => present,
-    replace => true,
-    owner   => 'root',
-    mode    => 0600,
-    content => template('etherpad_lite/eplite.crt.erb'),
-    require => File['/etc/ssl/certs'],
-  }
-
-  file { "/etc/ssl/private/${vhost_name}.key":
-    ensure  => present,
-    replace => true,
-    owner   => 'root',
-    mode    => 0600,
-    content => template('etherpad_lite/eplite.key.erb'),
-    require => File['/etc/ssl/private'],
-  }
-
-
   if $ssl_cert_file_contents != '' {
     file { $ssl_cert_file:
       owner   => 'root',
@@ -88,6 +67,4 @@ class etherpad_lite::apache (
       before  => Apache::Vhost[$vhost_name],
     }
   }
-
-
 }
diff --git a/modules/etherpad_lite/templates/eplite.crt.erb b/modules/etherpad_lite/templates/eplite.crt.erb
deleted file mode 100644
index 2b2bdcdbc5..0000000000
--- a/modules/etherpad_lite/templates/eplite.crt.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= etherpad_crt %>
diff --git a/modules/etherpad_lite/templates/eplite.key.erb b/modules/etherpad_lite/templates/eplite.key.erb
deleted file mode 100644
index 9f99d02c15..0000000000
--- a/modules/etherpad_lite/templates/eplite.key.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= etherpad_key %>