From aed223ad42635370bdbc1b239ed43a1330698c5e Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 4 Feb 2015 14:03:31 -0800
Subject: consolidate sources into common.json

---
 puppet/modules/site_nickserver/manifests/init.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'puppet/modules/site_nickserver')

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'] ],
-- 
cgit v1.2.3