From 37671077290a1a1ef7bc2e1913b094e9f6f5160a Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 26 Jan 2025 16:25:18 +1100
Subject: [PATCH] feat: etcd remove service/user

- change etcd to bin only, bump revision
---
 rpms/etcd/3.5.18/release                   |  2 +-
 rpms/etcd/Dockerfile                       |  1 -
 rpms/etcd/nfpm.yaml                        | 13 -------------
 rpms/etcd/resources/etcd.service           | 18 ------------------
 rpms/etcd/resources/scripts/postinstall.sh |  2 --
 rpms/etcd/resources/scripts/postremove.sh  |  3 ---
 rpms/etcd/resources/scripts/preinstall.sh  |  5 -----
 rpms/etcd/resources/scripts/preremove.sh   |  2 --
 8 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 rpms/etcd/resources/etcd.service
 delete mode 100755 rpms/etcd/resources/scripts/postinstall.sh
 delete mode 100755 rpms/etcd/resources/scripts/postremove.sh
 delete mode 100755 rpms/etcd/resources/scripts/preinstall.sh
 delete mode 100755 rpms/etcd/resources/scripts/preremove.sh

diff --git a/rpms/etcd/3.5.18/release b/rpms/etcd/3.5.18/release
index d00491f..0cfbf08 100644
--- a/rpms/etcd/3.5.18/release
+++ b/rpms/etcd/3.5.18/release
@@ -1 +1 @@
-1
+2
diff --git a/rpms/etcd/Dockerfile b/rpms/etcd/Dockerfile
index 628f8a6..ea9a576 100644
--- a/rpms/etcd/Dockerfile
+++ b/rpms/etcd/Dockerfile
@@ -14,7 +14,6 @@ ENV PACKAGE_VERSION=${PACKAGE_VERSION}
 
 # Copy nfpm.yaml from the context into the container
 COPY nfpm.yaml /app/nfpm.yaml
-COPY resources /app/resources
 
 # Download the required files
 RUN wget -O /app/etcd-v${PACKAGE_VERSION}-linux-amd64.tar.gz https://github.com/etcd-io/etcd/releases/download/v${PACKAGE_VERSION}/etcd-v${PACKAGE_VERSION}-linux-amd64.tar.gz && \
diff --git a/rpms/etcd/nfpm.yaml b/rpms/etcd/nfpm.yaml
index f495f32..b2eb14d 100644
--- a/rpms/etcd/nfpm.yaml
+++ b/rpms/etcd/nfpm.yaml
@@ -45,16 +45,3 @@ contents:
       mode: 0755
       owner: root
       group: root
-  - src: /app/resources/etcd.service
-    dst: /usr/lib/systemd/system/etcd.service
-    file_info:
-      mode: 0644
-      owner: root
-      group: root
-
-# Scripts to run during installation/removal (optional)
-scripts:
-  preinstall: ./resources/scripts/preinstall.sh
-  postinstall: ./resources/scripts/postinstall.sh
-  preremove: ./resources/scripts/preremove.sh
-  postremove: ./resources/scripts/postremove.sh
diff --git a/rpms/etcd/resources/etcd.service b/rpms/etcd/resources/etcd.service
deleted file mode 100644
index 8fc0570..0000000
--- a/rpms/etcd/resources/etcd.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=etcd key-value store
-Documentation=https://github.com/etcd-io/etcd
-After=network-online.target local-fs.target remote-fs.target time-sync.target
-Wants=network-online.target local-fs.target remote-fs.target time-sync.target
-
-[Service]
-User=etcd
-Type=notify
-Environment=ETCD_DATA_DIR=/var/lib/etcd
-Environment=ETCD_NAME=%m
-ExecStart=/usr/bin/etcd
-Restart=always
-RestartSec=10s
-LimitNOFILE=40000
-
-[Install]
-WantedBy=multi-user.target
diff --git a/rpms/etcd/resources/scripts/postinstall.sh b/rpms/etcd/resources/scripts/postinstall.sh
deleted file mode 100755
index 50041ee..0000000
--- a/rpms/etcd/resources/scripts/postinstall.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-systemctl daemon-reload
diff --git a/rpms/etcd/resources/scripts/postremove.sh b/rpms/etcd/resources/scripts/postremove.sh
deleted file mode 100755
index eb463c9..0000000
--- a/rpms/etcd/resources/scripts/postremove.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-rm -f /usr/lib/systemd/system/etcd.service
-systemctl daemon-reload
diff --git a/rpms/etcd/resources/scripts/preinstall.sh b/rpms/etcd/resources/scripts/preinstall.sh
deleted file mode 100755
index 9c8237c..0000000
--- a/rpms/etcd/resources/scripts/preinstall.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-groupadd --system etcd
-useradd --system --shell /sbin/nologin --no-create-home --home-dir /var/lib/etcd --gid etcd etcd
-mkdir -p /var/lib/etcd
-chown etcd:etcd /var/lib/etcd
diff --git a/rpms/etcd/resources/scripts/preremove.sh b/rpms/etcd/resources/scripts/preremove.sh
deleted file mode 100755
index 1021f6c..0000000
--- a/rpms/etcd/resources/scripts/preremove.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-systemctl stop etcd.service