summaryrefslogtreecommitdiff
path: root/puppet/modules/tapicero
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/tapicero')
-rw-r--r--puppet/modules/tapicero/manifests/init.pp8
-rw-r--r--puppet/modules/tapicero/templates/tapicero.yaml.erb1
2 files changed, 6 insertions, 3 deletions
diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp
index 28711b94..8afb18b8 100644
--- a/puppet/modules/tapicero/manifests/init.pp
+++ b/puppet/modules/tapicero/manifests/init.pp
@@ -15,6 +15,8 @@ class tapicero {
$couchdb_mode = $couchdb['mode']
$couchdb_replication = $couchdb['replication']
+ $sources = hiera('sources')
+
Class['site_config::default'] -> Class['tapicero']
include site_config::ruby::dev
@@ -95,9 +97,9 @@ class tapicero {
vcsrepo { '/srv/leap/tapicero':
ensure => present,
force => true,
- revision => 'origin/version/0.6',
- provider => git,
- source => 'https://leap.se/git/tapicero',
+ revision => $sources['tapicero']['revision'],
+ provider => $sources['tapicero']['type'],
+ source => $sources['tapicero']['source'],
owner => 'tapicero',
group => 'tapicero',
require => [ User['tapicero'], Group['tapicero'] ],
diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb
index 510450ad..40048a5e 100644
--- a/puppet/modules/tapicero/templates/tapicero.yaml.erb
+++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb
@@ -13,6 +13,7 @@ connection:
password: <%= @couchdb_admin_password %>
prefix : ""
suffix : ""
+ netrc: "/etc/couchdb/couchdb.netrc"
# file to store the last processed user record in so we can resume after
# a restart: