From 4fc7419598a3baf564f063b7330b9cf9115420b5 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 1 Oct 2015 12:06:02 +0200
Subject: [feat] Create-user-db: use couchdb admin rights

- create soledad-admin user
- deploy netrc file for userdb creation
- Move soledad-server.conf from /etc/leap to /etc/soledad
- make soledad-server.conf group-accessible for the soledad group, so
  the soledad-admin user can read it

- Resolves: #7502
---
 puppet/modules/soledad/manifests/init.pp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/soledad/manifests/init.pp')

diff --git a/puppet/modules/soledad/manifests/init.pp b/puppet/modules/soledad/manifests/init.pp
index 7cf0b729..6a2c328e 100644
--- a/puppet/modules/soledad/manifests/init.pp
+++ b/puppet/modules/soledad/manifests/init.pp
@@ -1,18 +1,29 @@
+# set up users, group and directories for soledad-server
+# although the soledad users are already created by the
+# soledad-server package
 class soledad {
 
   group { 'soledad':
-    ensure    => present,
-    allowdupe => false;
+    ensure => present,
+    system => true,
   }
 
   user { 'soledad':
     ensure    => present,
-    allowdupe => false,
+    system    => true,
     gid       => 'soledad',
     home      => '/srv/leap/soledad',
     require   => Group['soledad'];
   }
 
+  user { 'soledad-admin':
+    ensure  => present,
+    system  => true,
+    gid     => 'soledad',
+    home    => '/srv/leap/soledad',
+    require => Group['soledad'];
+  }
+
   file {
     '/srv/leap/soledad':
       ensure  => directory,
-- 
cgit v1.2.3


From 72bec64f52895153612b5e736274266ebc0ab554 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 30 Oct 2015 10:31:17 +0100
Subject: [feat] Add soledad::client class for soledad-sync

- Restructure soledad class
- Include soledad::client class on webapp nodes

- Tested: [unstable.bitmask.net]
- Related: #7523
---
 puppet/modules/soledad/manifests/init.pp | 40 --------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 puppet/modules/soledad/manifests/init.pp

(limited to 'puppet/modules/soledad/manifests/init.pp')

diff --git a/puppet/modules/soledad/manifests/init.pp b/puppet/modules/soledad/manifests/init.pp
deleted file mode 100644
index 6a2c328e..00000000
--- a/puppet/modules/soledad/manifests/init.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# set up users, group and directories for soledad-server
-# although the soledad users are already created by the
-# soledad-server package
-class soledad {
-
-  group { 'soledad':
-    ensure => present,
-    system => true,
-  }
-
-  user { 'soledad':
-    ensure    => present,
-    system    => true,
-    gid       => 'soledad',
-    home      => '/srv/leap/soledad',
-    require   => Group['soledad'];
-  }
-
-  user { 'soledad-admin':
-    ensure  => present,
-    system  => true,
-    gid     => 'soledad',
-    home    => '/srv/leap/soledad',
-    require => Group['soledad'];
-  }
-
-  file {
-    '/srv/leap/soledad':
-      ensure  => directory,
-      owner   => 'soledad',
-      group   => 'soledad',
-      require => User['soledad'];
-
-    '/var/lib/soledad':
-      ensure  => directory,
-      owner   => 'soledad',
-      group   => 'soledad',
-      require => User['soledad'];
-  }
-}
-- 
cgit v1.2.3