From a8104d0b516ec10287e4dcc7d09cd4bd5195a159 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Fri, 3 Mar 2017 10:48:56 +0100
Subject: [PATCH] TT#5161 sipwise/cdrexport user/group id can be 1000/10000

Freshly installed systems use IDs 10000/10001 nowadays,
while systems that are upgraded from old(er) releases use IDs 1000/1001.

It happens because in the past users sipwise/cdrexport were
created by installer directly, while currently ngcp-support-access
cares about sipwise/cdrexport user using new id based 10000+

Change-Id: I1a08aa722d1648ebef451c111dea4ff8750a54eb
(cherry picked from commit 284abaa49b1cb9734ed8b1f5417fcca41d04c5cf)
---
 ce/05_system_users.yaml.tt2 | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/ce/05_system_users.yaml.tt2 b/ce/05_system_users.yaml.tt2
index f8d1777..10639ca 100644
--- a/ce/05_system_users.yaml.tt2
+++ b/ce/05_system_users.yaml.tt2
@@ -1,8 +1,10 @@
 group:
   cdrexport:
     exists: true
-    gid: 10001
-
+    gid:
+      or:
+        - 1001
+        - 10001
   daemon:
     exists: true
     gid: 1
@@ -31,7 +33,10 @@ group:
 
   sipwise:
     exists: true
-    gid: 10000
+    gid:
+      or:
+        - 1000
+        - 10000
 
   ssh:
     exists: true
@@ -51,8 +56,14 @@ user:
 
   cdrexport:
     exists: true
-    uid: 10001
-    gid: 10001
+    uid:
+      or:
+        - 1001
+        - 10001
+    gid:
+      or:
+        - 1001
+        - 10001
     groups:
       - cdrexport
     home: "/home/jail/home/cdrexport"
@@ -103,8 +114,14 @@ user:
 
   sipwise:
     exists: true
-    uid: 10000
-    gid: 10000
+    uid:
+      or:
+        - 1000
+        - 10000
+    gid:
+      or:
+        - 1000
+        - 10000
     groups:
       - sipwise
     home: "/var/sipwise"