Merge tag '0.7.0'

Releasing 0.7.0

2 files changed, 19 insertions, 14 deletions

diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp
index 28711b94..ca8488c8 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
@@ -42,9 +44,9 @@ class tapicero {
 
   file {
 
-    ##
-    ## TAPICERO DIRECTORIES
-    ##
+    #
+    # TAPICERO DIRECTORIES
+    #
 
     '/srv/leap/tapicero':
       ensure  => directory,
@@ -65,9 +67,9 @@ class tapicero {
       group   => 'tapicero',
       require => User['tapicero'];
 
-    ##
-    ## TAPICERO CONFIG
-    ##
+    #
+    # TAPICERO CONFIG
+    #
 
     '/etc/leap/tapicero.yaml':
       content => template('tapicero/tapicero.yaml.erb'),
@@ -76,9 +78,9 @@ class tapicero {
       mode    => '0600',
       notify  => Service['tapicero'];
 
-    ##
-    ## TAPICERO INIT
-    ##
+    #
+    # TAPICERO INIT
+    #
 
     '/etc/init.d/tapicero':
       source  => 'puppet:///modules/tapicero/tapicero.init',
@@ -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'] ],
@@ -131,4 +133,5 @@ class tapicero {
                     Couchdb::Add_user[$::site_couchdb::couchdb_tapicero_user] ];
   }
 
+  leap::logfile { 'tapicero': }
 }
diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb
index 510450ad..8b08b49c 100644
--- a/puppet/modules/tapicero/templates/tapicero.yaml.erb
+++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb
@@ -13,13 +13,15 @@ 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:
-seq_file: "/var/lib/leap/tapicero/tapicero.seq"
+seq_dir: "/var/lib/leap/tapicero/"
 
 # Configure log_file like this if you want to log to a file instead of syslog:
-# log_file: "/var/leap/log/tapicero.log"
+#log_file: "/var/log/leap/tapicero.log"
+#log_level: debug
 log_level: info
 
 # tapicero specific options