From 1e3ce0ec1c1c88d00c3c27962bc71efbfcd52ae1 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sat, 26 Apr 2025 20:02:57 +1000
Subject: [PATCH] feat: dont set gid/uid for sysadmin (#265)

- sysadmin doesnt need to be a specific uid/gid, the next available
  uid/gid is fine

Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/265
---
 site/profiles/manifests/accounts/sysadmin.pp | 2 --
 site/profiles/manifests/base/account.pp      | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/site/profiles/manifests/accounts/sysadmin.pp b/site/profiles/manifests/accounts/sysadmin.pp
index 0c9050d..8e5d6a6 100644
--- a/site/profiles/manifests/accounts/sysadmin.pp
+++ b/site/profiles/manifests/accounts/sysadmin.pp
@@ -15,8 +15,6 @@ class profiles::accounts::sysadmin(
 
   profiles::base::account {'sysadmin':
     username   => 'sysadmin',
-    uid        => 1000,
-    gid        => 1000,
     groups     => $groups,
     sshkeys    => $sshkeys,
     sudo_rules => ['sysadmin ALL=(ALL) NOPASSWD:ALL'],
diff --git a/site/profiles/manifests/base/account.pp b/site/profiles/manifests/base/account.pp
index 92011b4..e9dd48c 100644
--- a/site/profiles/manifests/base/account.pp
+++ b/site/profiles/manifests/base/account.pp
@@ -1,8 +1,8 @@
 # a wrapper for puppetlabs-account and saz-sudo
 define profiles::base::account (
   String $username,
-  Integer $uid,
-  Integer $gid = undef,
+  Optional[Integer] $uid = undef,
+  Optional[Integer] $gid = undef,
   Boolean $manage_home = true,
   Boolean $create_group = true,
   Boolean $purge_sshkeys = true,