From 375527b1629597e35a6aeeef6c248a8b085abd87 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 24 Nov 2015 16:03:13 -0500
Subject: Switch from 'vmail' to leap-mx's user/group (#6936, #7639)

This change will make sure that the user/group for leap-mx exist, and it
changes the mail location from /var/mail/vmail to the more helpful name
/var/mail/leap-mx.

This change requires:

https://github.com/leapcode/leap_mx/pull/78

and it would replace merge request:

https://github.com/leapcode/leap_mx/pull/65

and fix https://leap.se/code/issues/6936 and
https://leap.se/code/issues/7635

Change-Id: Idbe678dc999e394232c2eeef2b2018d39ab7cc3b
---
 puppet/modules/leap_mx/manifests/init.pp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

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

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 5561e326..9c1b9143 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -15,18 +15,29 @@ class leap_mx {
   #
   # USER AND GROUP
   #
+  # Make the user for leap-mx. This user is where all legitimate, non-system
+  # mail is delivered so leap-mx can process it. Previously, we let the system
+  # pick a uid/gid, but we need to know what they are set to in order to set the
+  # virtual_uid_maps and virtual_gid_maps. Its a bit overkill write a fact just
+  # for this, so instead we pick arbitrary numbers that seem unlikely to be used
+  # and then use them in the postfix configuration
 
   group { 'leap-mx':
     ensure    => present,
+    gid       => 42424,
     allowdupe => false;
   }
 
   user { 'leap-mx':
-    ensure    => present,
-    allowdupe => false,
-    gid       => 'leap-mx',
-    home      => '/etc/leap',
-    require   => Group['leap-mx'];
+    ensure     => present,
+    comment    => 'Leap Mail',
+    allowdupe  => false,
+    uid        => 42424,
+    gid        => 'leap-mx',
+    home       => '/var/mail/leap-mx',
+    shell      => '/bin/false',
+    managehome => true,
+    require    => Group['leap-mx'];
   }
 
   #
@@ -52,7 +63,8 @@ class leap_mx {
       ensure  => $sources['leap-mx']['revision'],
       require => [
         Class['site_apt::preferences::twisted'],
-        Class['site_apt::leap_repo'] ];
+        Class['site_apt::leap_repo']
+        User['leap-mx'] ];
 
     'leap-keymanager':
       ensure => latest;
-- 
cgit v1.2.3