From 127db73dabd33ada9355b274d92482b3d2ab1072 Mon Sep 17 00:00:00 2001
From: Shaun Maher <shaun@ghanima.net>
Date: Thu, 16 Jul 2020 18:00:48 +1000
Subject: [PATCH 1/4] fix(install): replace `gid_from_name` (deprecated in
 `develop`)

---
 etcd/install.sls | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/etcd/install.sls b/etcd/install.sls
index 1790011..613123b 100644
--- a/etcd/install.sls
+++ b/etcd/install.sls
@@ -9,17 +9,10 @@ include:
 
   {%- if etcd.manage_users %}
 etcd-user-group-home:
-  group.present:
-    - name: {{ etcd.group or 'etcd' }}
-    - system: True
-    - require_in:
-      - user: etcd-user-group-home
   user.present:
     - name: {{ etcd.user or 'etcd' }}
-    - gid_from_name: True
+    - gid: {{ etcd.user or 'etcd' }}
     - home: {{ etcd.prefix }}
-    - require:
-      - group: etcd-user-group-home
     - require_in:
       - file: etcd-user-envfile
       - file: etcd-extract-dirs
@@ -43,7 +36,6 @@ etcd-extract-dirs:
       - group
     - require:
       - user: etcd-user-group-home
-      - group: etcd-user-group-home
     - require_in:
       - file: etcd-user-envfile
 

From b52c6465d65d0b6dc189fe3ccb19746816cb546a Mon Sep 17 00:00:00 2001
From: Shaun Maher <shaun@ghanima.net>
Date: Mon, 20 Jul 2020 17:35:12 +1000
Subject: [PATCH 2/4] Update install.sls

---
 etcd/install.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etcd/install.sls b/etcd/install.sls
index 613123b..a015845 100644
--- a/etcd/install.sls
+++ b/etcd/install.sls
@@ -11,7 +11,7 @@ include:
 etcd-user-group-home:
   user.present:
     - name: {{ etcd.user or 'etcd' }}
-    - gid: {{ etcd.user or 'etcd' }}
+    - gid: {{ etcd.group or 'etcd' }}
     - home: {{ etcd.prefix }}
     - require_in:
       - file: etcd-user-envfile

From 092bafff5647db97e7df919537a72782df1e99f3 Mon Sep 17 00:00:00 2001
From: Shaun Maher <shaun@ghanima.net>
Date: Mon, 20 Jul 2020 17:37:12 +1000
Subject: [PATCH 3/4] Update systemd.service.jinja

---
 etcd/files/systemd.service.jinja | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/etcd/files/systemd.service.jinja b/etcd/files/systemd.service.jinja
index 0eaeb6e..e6bfd13 100644
--- a/etcd/files/systemd.service.jinja
+++ b/etcd/files/systemd.service.jinja
@@ -4,7 +4,10 @@ Documentation=https://github.com/coreos/etcd
 After=network.target
 
 [Service]
-User=root
+{%- if etcd.manage_users %}
+User={{ etcd.user or 'etcd' }}
+Group={{ etcd.group or 'etcd' }}
+{%- endif %}
 Type=notify
 
 {#- ignore --param bools in environ #}

From 574775ed2d8ea2471a06b98e2131298d24ab2527 Mon Sep 17 00:00:00 2001
From: Shaun Maher <shaun@ghanima.net>
Date: Mon, 20 Jul 2020 19:04:09 +1000
Subject: [PATCH 4/4] Update install.sls

---
 etcd/install.sls | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/etcd/install.sls b/etcd/install.sls
index a015845..8fe11ed 100644
--- a/etcd/install.sls
+++ b/etcd/install.sls
@@ -9,10 +9,17 @@ include:
 
   {%- if etcd.manage_users %}
 etcd-user-group-home:
+  group.present:
+    - name: {{ etcd.group or 'etcd' }}
+    - system: True
+    - require_in:
+      - user: etcd-user-group-home
   user.present:
     - name: {{ etcd.user or 'etcd' }}
     - gid: {{ etcd.group or 'etcd' }}
     - home: {{ etcd.prefix }}
+    - require:
+      - group: etcd-user-group-home
     - require_in:
       - file: etcd-user-envfile
       - file: etcd-extract-dirs
@@ -36,6 +43,7 @@ etcd-extract-dirs:
       - group
     - require:
       - user: etcd-user-group-home
+      - group: etcd-user-group-home
     - require_in:
       - file: etcd-user-envfile