Github messages for voidlinux
 help / color / mirror / Atom feed
From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] caddy: add  to the service
Date: Fri, 16 Dec 2022 19:26:11 +0100	[thread overview]
Message-ID: <20221216182611.oHP8D6JPokieyMtYRwXygGwftfYWEGnPzzi9GkmbUWk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41135@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages caddy-opts
https://github.com/void-linux/void-packages/pull/41135

caddy: add  to the service
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-caddy-opts-41135.patch --]
[-- Type: text/x-diff, Size: 1119 bytes --]

From f0f353d152ffe8e8ab13a510710d3f5e9a22ed03 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 16 Dec 2022 19:23:55 +0100
Subject: [PATCH] caddy: add $OPTS to the service

---
 srcpkgs/caddy/files/caddy/run | 2 +-
 srcpkgs/caddy/template        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/caddy/files/caddy/run b/srcpkgs/caddy/files/caddy/run
index c8670fa67b69..58940d1bfd3b 100644
--- a/srcpkgs/caddy/files/caddy/run
+++ b/srcpkgs/caddy/files/caddy/run
@@ -5,4 +5,4 @@
 export HOME=/var/lib/caddy
 ulimit -n ${MAX_OPEN_FILES:-8192}
 
-exec chpst -u caddy caddy run --config ${CONFFILE:-/etc/caddy/Caddyfile}
+exec chpst -u caddy caddy run ${OPTS} --config ${CONFFILE:-/etc/caddy/Caddyfile}
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index cfed00140942..8a52cdf5933b 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"

  reply	other threads:[~2022-12-16 18:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-16 18:25 [PR PATCH] " paper42
2022-12-16 18:26 ` paper42 [this message]
2022-12-18 10:35 ` [PR PATCH] [Merged]: caddy: add $OPTS " paper42

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=20221216182611.oHP8D6JPokieyMtYRwXygGwftfYWEGnPzzi9GkmbUWk@z \
    --to=paper42@users.noreply.github.com \
    --cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).