From 8ce5fe27d53e0e1f5f36a9de812069a823d59222 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 1 Jun 2016 13:08:38 -0700
Subject: ensure soledad server has access to x509::variables

---
 puppet/modules/soledad/manifests/server.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'puppet/modules/soledad')

diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 8674f421..6cf806d0 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -17,6 +17,7 @@ class soledad::server {
 
   $sources      = hiera('sources')
 
+  include x509::variables
   include site_config::x509::cert
   include site_config::x509::key
   include site_config::x509::ca
-- 
cgit v1.2.3


From b0c33b9c66116eb49f583a05d7baaaab7b6e7a15 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 31 Aug 2016 21:36:44 +0200
Subject: [style] lint soledad::server

---
 puppet/modules/soledad/manifests/server.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'puppet/modules/soledad')

diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 6cf806d0..c5e2455d 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -2,8 +2,8 @@
 class soledad::server {
   tag 'leap_service'
 
-  include site_config::default
-  include soledad::common
+  include ::site_config::default
+  include ::soledad::common
 
   $soledad              = hiera('soledad')
   $couchdb_user         = $soledad['couchdb_soledad_user']['username']
@@ -90,11 +90,11 @@ class soledad::server {
   }
   user {
     'soledad':
-      ensure    => present,
-      system    => true,
-      gid       => 'soledad',
-      home      => '/srv/leap/soledad',
-      require   => Group['soledad'];
+      ensure  => present,
+      system  => true,
+      gid     => 'soledad',
+      home    => '/srv/leap/soledad',
+      require => Group['soledad'];
     'soledad-admin':
       ensure  => present,
       system  => true,
-- 
cgit v1.2.3


From 9ef0d00b4302b7ddfc9d5620eeb4fad90d3a15aa Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 31 Aug 2016 22:11:49 +0200
Subject: [bug] Remove Nagios soledad procs check

leap_cli already checks for running procs

- Resolves: #8380
---
 puppet/modules/soledad/manifests/server.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'puppet/modules/soledad')

diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index c5e2455d..81f51188 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -4,6 +4,7 @@ class soledad::server {
 
   include ::site_config::default
   include ::soledad::common
+  include ::site_config::remove::soledad
 
   $soledad              = hiera('soledad')
   $couchdb_user         = $soledad['couchdb_soledad_user']['username']
-- 
cgit v1.2.3


From c752039fdf59e5c8a18c5dc7c611bd996e323eec Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 28 Sep 2016 11:06:05 +0200
Subject: [feat] Use twisted 16.2 from jessie-backports

New soledad packages now depend on Twisted 16.2.0 (see
https://leap.se/code/issues/8412), so we need to pin twisted to get
installed from jessie-backports.

- Resolves: #8418
---
 puppet/modules/soledad/manifests/common.pp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'puppet/modules/soledad')

diff --git a/puppet/modules/soledad/manifests/common.pp b/puppet/modules/soledad/manifests/common.pp
index 8d8339d4..35969362 100644
--- a/puppet/modules/soledad/manifests/common.pp
+++ b/puppet/modules/soledad/manifests/common.pp
@@ -1,6 +1,9 @@
 # install soledad-common, both needed both soledad-client and soledad-server
 class soledad::common {
 
+  # install twisted from jessie backports
+  include ::site_apt::preferences::twisted
+
   package { 'soledad-common':
     ensure  => latest;
   }
-- 
cgit v1.2.3