public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Carl George <carlwgeorge@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/caddy] rawhide: Generate sysusers file from within the spec file
Date: Fri, 12 Jun 2026 21:59:12 GMT	[thread overview]
Message-ID: <178130155233.1.16320760961752436809.rpms-caddy-320e63b3cff0@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/caddy
            Branch : rawhide
            Commit : 320e63b3cff04197d7b72a1b2b92ad394df97a50
            Author : Carl George <carlwgeorge@gmail.com>
            Date   : 2026-06-12T16:57:25-05:00
            Stats  : +3/-3 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/caddy/c/320e63b3cff04197d7b72a1b2b92ad394df97a50?branch=rawhide

            Log:
            Generate sysusers file from within the spec file

This also drops the last field from the file, as systemd defaults to a
nologin shell if the field is missing.

[skip changelog]

---
diff --git a/caddy.spec b/caddy.spec
index f37f5f4..c83ebac 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -25,7 +25,6 @@ Source2:        create-vendor-tarball.sh
 Source10:       Caddyfile
 Source20:       caddy.service
 Source21:       caddy-api.service
-Source22:       caddy.sysusers
 Source30:       poweredby-white.png
 Source31:       poweredby-black.png
 
@@ -264,7 +263,9 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/caddy/Caddyfile.d
 install -D -p -m 0644 -t %{buildroot}%{_unitdir} %{S:20} %{S:21}
 
 # sysusers
-install -D -p -m 0644 %{S:22} %{buildroot}%{_sysusersdir}/caddy.conf
+cat > %{buildroot}%{_sysusersdir}/caddy.conf << EOF
+u caddy - "Caddy web server" /var/lib/caddy
+EOF
 
 # data directory
 install -d -m 0750 %{buildroot}%{_sharedstatedir}/caddy

diff --git a/caddy.sysusers b/caddy.sysusers
deleted file mode 100644
index 3e98c73..0000000
--- a/caddy.sysusers
+++ /dev/null
@@ -1 +0,0 @@
-u caddy - "Caddy web server" /var/lib/caddy /usr/sbin/nologin

                 reply	other threads:[~2026-06-12 21:59 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178130155233.1.16320760961752436809.rpms-caddy-320e63b3cff0@fedoraproject.org \
    --to=carlwgeorge@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox