diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-04 11:27:59 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-04 11:27:59 -0400 |
| commit | 264e63967d9247e42662182aec771fbfb81e8e8e (patch) | |
| tree | ce690c15d9f49a367c92bbd5a6e2780a9f13968c | |
| parent | e1aa287ee60d39cc55a1b31da59652898eb21b5c (diff) | |
rename the bigcouch_replication_[server,client] to be the more accurately, and
shorter named epmd (erlang port mapper daemon)
| -rw-r--r-- | provider_base/services/couchdb.json | 4 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/stunnel.pp | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index ce46e3bb..111baf08 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -5,8 +5,8 @@ }, "stunnel": { "couch_server": "= stunnel_server(couch.port)", - "bigcouch_replication_server": "= stunnel_server(couch.bigcouch.port)", - "bigcouch_replication_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.port)" + "epmd_server": "= stunnel_server(couch.bigcouch.port)", + "epmd_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.port)" }, "couch": { "port": 5984, diff --git a/puppet/modules/site_couchdb/manifests/stunnel.pp b/puppet/modules/site_couchdb/manifests/stunnel.pp index 1eb79293..40b8f450 100644 --- a/puppet/modules/site_couchdb/manifests/stunnel.pp +++ b/puppet/modules/site_couchdb/manifests/stunnel.pp @@ -6,11 +6,11 @@ class site_couchdb::stunnel ($key, $cert, $ca) { $couch_server_accept = $couch_server['accept'] $couch_server_connect = $couch_server['connect'] - $bigcouch_replication_server = $stunnel['bigcouch_replication_server'] - $bigcouch_replication_server_accept = $bigcouch_replication_server['accept'] - $bigcouch_replication_server_connect = $bigcouch_replication_server['connect'] + $epmd_server = $stunnel['epmd_server'] + $epmd_server_accept = $epmd_server['accept'] + $epmd_server_connect = $epmd_server['connect'] - $bigcouch_replication_clients = $stunnel['bigcouch_replication_clients'] + $epmd_clients = $stunnel['epmd_clients'] include x509::variables $cert_name = 'leap_couchdb' @@ -45,26 +45,26 @@ class site_couchdb::stunnel ($key, $cert, $ca) { # setup stunnels for bigcouch clustering between each bigcouchdb node # server - stunnel::service { 'bigcouch_replication_server': - accept => $bigcouch_replication_server_accept, - connect => $bigcouch_replication_server_connect, + stunnel::service { 'epmd_server': + accept => $epmd_server_accept, + connect => $epmd_server_connect, client => false, cafile => $ca_path, key => $key_path, cert => $cert_path, verify => '2', - pid => '/var/run/stunnel4/bigcouchreplication_server.pid', + pid => '/var/run/stunnel4/epmd_server.pid', rndfile => '/var/lib/stunnel4/.rnd', debuglevel => '4' } # clients - $bigcouch_replication_client_defaults = { + $epmd_client_defaults = { 'client' => true, 'cafile' => $ca_path, 'key' => $key_path, 'cert' => $cert_path, } - create_resources(site_stunnel::clients, $bigcouch_replication_clients, $bigcouch_replication_client_defaults) + create_resources(site_stunnel::clients, $epmd_clients, $epmd_client_defaults) } |