Merge remote-tracking branch 'origin/develop'0.2.2

Conflicts:
	provider_base/services/webapp.json

1 files changed, 0 insertions, 16 deletions

diff --git a/puppet/modules/site_ca_daemon/manifests/couchdb.pp b/puppet/modules/site_ca_daemon/manifests/couchdb.pp
deleted file mode 100644
index f446a05b..00000000
--- a/puppet/modules/site_ca_daemon/manifests/couchdb.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-class site_ca_daemon::couchdb {
-
-  $ca               = hiera('ca_daemon')
-  $couchdb_host     = $ca['couchdb_hosts']
-  $couchdb_user     = $ca['couchdb_user']['username']
-  $couchdb_password = $ca['couchdb_user']['password']
-
-  file {
-    '/etc/leap/leap_ca.yaml':
-      content => template('site_ca_daemon/leap_ca.yaml.erb'),
-      owner   => leap_ca_daemon,
-      group   => leap_ca_daemon,
-      mode    => '0600';
-  }
-
-}