From 7ee86658b0655ded592eecbaa8b1c5b841d8f846 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 19 Jun 2014 20:01:20 +0200 Subject: set mirror option if we are on a couch mirror --- puppet/modules/tapicero/manifests/init.pp | 1 + puppet/modules/tapicero/templates/tapicero.yaml.erb | 2 ++ 2 files changed, 3 insertions(+) (limited to 'puppet/modules/tapicero') diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp index af1a96ac..1db75eb0 100644 --- a/puppet/modules/tapicero/manifests/init.pp +++ b/puppet/modules/tapicero/manifests/init.pp @@ -12,6 +12,7 @@ class tapicero { $couchdb_soledad_user = $couchdb_users['soledad']['username'] $couchdb_leap_mx_user = $couchdb_users['leap_mx']['username'] + $couchdb_mirror = $couchdb['mode'] == 'mirror' Class['site_config::default'] -> Class['tapicero'] diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb index 8e19b22f..3a5f821e 100644 --- a/puppet/modules/tapicero/templates/tapicero.yaml.erb +++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb @@ -24,6 +24,7 @@ log_level: info options: # prefix for per user databases: db_prefix: "user-" + mirror: <%= @couchdb_mirror %> # security settings to be used for the per user databases security: @@ -40,3 +41,4 @@ options: - <%= @couchdb_leap_mx_user %> roles: [] + -- cgit v1.2.3 From 813f840cceb284c38dcedea1577d125e62e280f0 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 23 Jun 2014 21:50:50 +0200 Subject: hand replication credentials to tapicero --- puppet/modules/tapicero/manifests/init.pp | 3 ++- puppet/modules/tapicero/templates/tapicero.yaml.erb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'puppet/modules/tapicero') diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp index 1db75eb0..fd8c1344 100644 --- a/puppet/modules/tapicero/manifests/init.pp +++ b/puppet/modules/tapicero/manifests/init.pp @@ -12,7 +12,8 @@ class tapicero { $couchdb_soledad_user = $couchdb_users['soledad']['username'] $couchdb_leap_mx_user = $couchdb_users['leap_mx']['username'] - $couchdb_mirror = $couchdb['mode'] == 'mirror' + $couchdb_mode = $couchdb['mode'] + $couchdb_replication = $couchdb['replication'] Class['site_config::default'] -> Class['tapicero'] diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb index 3a5f821e..182a6aa6 100644 --- a/puppet/modules/tapicero/templates/tapicero.yaml.erb +++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb @@ -24,7 +24,8 @@ log_level: info options: # prefix for per user databases: db_prefix: "user-" - mirror: <%= @couchdb_mirror %> + mode: <%= @couchdb_mode %> + replication: <%= @couchdb_replication %> # security settings to be used for the per user databases security: -- cgit v1.2.3 From 3206634d0d17064ecd4b18cc8e2e47051e422bf3 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 14 Jul 2014 19:50:41 +0200 Subject: proper json for tapicero config --- puppet/modules/tapicero/templates/tapicero.yaml.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'puppet/modules/tapicero') diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb index 182a6aa6..d6ea56fa 100644 --- a/puppet/modules/tapicero/templates/tapicero.yaml.erb +++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb @@ -1,3 +1,5 @@ +<%- require 'json' -%> + # # Default configuration options for Tapicero # @@ -25,7 +27,9 @@ options: # prefix for per user databases: db_prefix: "user-" mode: <%= @couchdb_mode %> - replication: <%= @couchdb_replication %> +<%- if @couchdb_replication %> + replication: <%= @couchdb_replication.to_json %> +<%- end -%> # security settings to be used for the per user databases security: -- cgit v1.2.3 From 42327f4881022424bed354356756ab5815d5ba3f Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 30 Jul 2014 16:47:47 +0200 Subject: add replication role to user databases with tapicero This way the replication has read access on the source and write access on the target. --- puppet/modules/tapicero/templates/tapicero.yaml.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'puppet/modules/tapicero') diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb index d6ea56fa..510450ad 100644 --- a/puppet/modules/tapicero/templates/tapicero.yaml.erb +++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb @@ -40,10 +40,11 @@ options: # explicit about this - <%= @couchdb_admin_user %> roles: [] - readers: + members: names: - <%= @couchdb_soledad_user %> - <%= @couchdb_leap_mx_user %> - roles: [] + roles: + - replication -- cgit v1.2.3 From fb02557925a464488c2996df3625c051c172f8ad Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 30 Nov 2014 22:18:41 -0800 Subject: pin tapicero to version/0.6 --- puppet/modules/tapicero/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/tapicero') diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp index 2bf72004..28711b94 100644 --- a/puppet/modules/tapicero/manifests/init.pp +++ b/puppet/modules/tapicero/manifests/init.pp @@ -95,7 +95,7 @@ class tapicero { vcsrepo { '/srv/leap/tapicero': ensure => present, force => true, - revision => 'origin/master', + revision => 'origin/version/0.6', provider => git, source => 'https://leap.se/git/tapicero', owner => 'tapicero', -- cgit v1.2.3 From 8d31cbc8e52f75384e9a5c3e3630a02effe063a8 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 14 Dec 2014 19:45:50 -0800 Subject: pin tapicero to origin/develop --- puppet/modules/tapicero/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/tapicero') diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp index 28711b94..32354823 100644 --- a/puppet/modules/tapicero/manifests/init.pp +++ b/puppet/modules/tapicero/manifests/init.pp @@ -95,7 +95,7 @@ class tapicero { vcsrepo { '/srv/leap/tapicero': ensure => present, force => true, - revision => 'origin/version/0.6', + revision => 'origin/develop' provider => git, source => 'https://leap.se/git/tapicero', owner => 'tapicero', -- cgit v1.2.3 From 42ce1aa4fdeaa54058acbbd8530031ce2e516373 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 14 Dec 2014 20:06:09 -0800 Subject: fix tapicero typo --- puppet/modules/tapicero/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/tapicero') diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp index 32354823..ae5d058e 100644 --- a/puppet/modules/tapicero/manifests/init.pp +++ b/puppet/modules/tapicero/manifests/init.pp @@ -95,7 +95,7 @@ class tapicero { vcsrepo { '/srv/leap/tapicero': ensure => present, force => true, - revision => 'origin/develop' + revision => 'origin/develop', provider => git, source => 'https://leap.se/git/tapicero', owner => 'tapicero', -- cgit v1.2.3 From 9e3be523477be6cf65a1ef1c83382eb7d74d4636 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 16 Dec 2014 10:59:35 -0800 Subject: repin tapicero to version/0.6 --- puppet/modules/tapicero/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/tapicero') diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp index ae5d058e..28711b94 100644 --- a/puppet/modules/tapicero/manifests/init.pp +++ b/puppet/modules/tapicero/manifests/init.pp @@ -95,7 +95,7 @@ class tapicero { vcsrepo { '/srv/leap/tapicero': ensure => present, force => true, - revision => 'origin/develop', + revision => 'origin/version/0.6', provider => git, source => 'https://leap.se/git/tapicero', owner => 'tapicero', -- cgit v1.2.3