diff options
| author | elijah <elijah@riseup.net> | 2015-02-04 14:03:31 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-02-04 14:03:31 -0800 |
| commit | aed223ad42635370bdbc1b239ed43a1330698c5e (patch) | |
| tree | 852d5d4e7d3e24eb8dd064435edf2a8c94feb0f3 /puppet/modules/site_nickserver | |
| parent | b76790c6b1a50406b8b576014614d000dc23b6ea (diff) | |
consolidate sources into common.json
Diffstat (limited to 'puppet/modules/site_nickserver')
| -rw-r--r-- | puppet/modules/site_nickserver/manifests/init.pp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index eaf90d55..c2deab0f 100644 --- a/puppet/modules/site_nickserver/manifests/init.pp +++ b/puppet/modules/site_nickserver/manifests/init.pp @@ -34,11 +34,12 @@ class site_nickserver { # See site_webapp/templates/haproxy_couchdb.cfg.erg $couchdb_port = '4096' + $sources = hiera('sources') + # temporarily for now: $domain = hiera('domain') $address_domain = $domain['full_suffix'] - include site_config::x509::cert include site_config::x509::key include site_config::x509::ca @@ -69,9 +70,9 @@ class site_nickserver { vcsrepo { '/srv/leap/nickserver': ensure => present, - revision => 'origin/master', - provider => git, - source => 'https://leap.se/git/nickserver', + revision => $sources['nickserver']['revision'], + provider => $sources['nickserver']['type'], + source => $sources['nickserver']['source'], owner => 'nickserver', group => 'nickserver', require => [ User['nickserver'], Group['nickserver'] ], |