Received: from aibo.runbox.com (aibo.runbox.com [91.220.196.211]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 5C46A782B33 for ; Sat, 11 Jul 2020 17:18:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=amk.ie; s=selector1; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject :Cc:To:From; bh=Fm6Qm25+2k8TehCynoRy9Vcao2tP7eJKPPN/AIjeNZY=; b=nvoCEcBet+dB+ 2/Em0wjco0R+GetEfByB3X5WztMY/i4vptj0IfCxydqO3tdJcCP5wZSwkosdZNEh5ZtxiHjlg0kvO tBuvl6hnBP6WMjDzg+NcOcK/Cwv8rk08vzhGC9SMQXKOLrOMJ8xxWD63ionG5LcYIGtyXVDeq9aPE M1BghCl+x7nG+bqFsHCz7ECrwWVawidglhEpYch2ABi+y8ov+6ctGV4fAJtZ7uKZJaVACJP7bIoon lADzPmZLjHPdr1Aw3tN3dLkK1+0dyo9Bvu4HnfsssrvzdZtExDnYrrxajEnkli96St0KZk0GEQdg2 Mll3JrujH595v0Q22qPFg==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1juJ8X-0006VQ-V6; Sat, 11 Jul 2020 19:18:06 +0200 Received: by submission01.runbox with esmtpsa [Authenticated alias (942369)] (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) id 1juJ8U-0000QD-05; Sat, 11 Jul 2020 19:18:02 +0200 From: Alex McGrath To: alpine-aports@lists.alpinelinux.org Cc: Linux User Subject: [PATCH v3] community/caddy: upgrade v2.1.1 Date: Sat, 11 Jul 2020 18:17:57 +0100 Message-Id: <20200711171757.10769-1-amk@amk.ie> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Linux User --- I'm really sorry, I messed it up a second time and didnt commit community/caddy/APKBUILD | 8 ++++---- community/caddy/caddy.confd | 3 ++- community/caddy/caddy.initd | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/community/caddy/APKBUILD b/community/caddy/APKBUILD index 6b7b028ce8..e18f262cbf 100644 --- a/community/caddy/APKBUILD +++ b/community/caddy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter # Maintainer: Chloe Kudryavtsev pkgname=caddy -pkgver=1.0.4 -pkgrel=3 +pkgver=2.1.1 +pkgrel=0 pkgdesc="Fast, cross-platform HTTP/2 web server with automatic HTTPS" url="https://caddyserver.com/" arch="all !s390x" @@ -37,7 +37,7 @@ prepare() { build() { GO111MODULE=on go build -v -o bin/caddy -ldflags \ "-X github.com/mholt/caddy/caddy/caddymain.gitTag=$pkgver" \ - ./caddy + ./cmd/caddy } check() { @@ -71,7 +71,7 @@ cleanup_srcdir() { default_cleanup_srcdir } -sha512sums="49dae9c0965000ba1cf36a6148ff78718383a511d671fb73edc3b08e4219db0a9902fc70e40bcbb13ffa7afaa520fd1e6303ea3776059de04085896c018d9c02 caddy-1.0.4.tar.gz +sha512sums="4359935f4267ada37e0ab2f3c3daeb30cb1853b03a11f988e0f25716ba385d90237d76334b66a66f914bc21b3b36bbc5112e572f17a9453a865c088013ad4ca6 caddy-2.1.1.tar.gz 1fbab66fbc913f194a94eee6e60e218fcc762b9467258ff22eed43dc98664692f2f2525226068fe3ca101cfe5b6727f16774c2a49c575abb83782416680f399a caddy.initd 7808688e92ab9950403a9b8ad29777f5bd0f75aa8cccc1d49958bb1e5af1b972dfba0c6d31931354f702a3a13933d0a1b8f28b82eed263773d71b79ec95cc15c caddy.confd c24805d17234e6cf40fe1dd102c03f05cf6129d43f58f5567d540a0e4400ce89994820bb0e317f611c65459ae26bcf7110e23a8fecaae11ca78a561892b45d75 caddy.conf" diff --git a/community/caddy/caddy.confd b/community/caddy/caddy.confd index 1c17719c61..bfefad6c03 100644 --- a/community/caddy/caddy.confd +++ b/community/caddy/caddy.confd @@ -1,2 +1,3 @@ # caddy options file -CADDY_OPTS="-conf /etc/caddy/caddy.conf -agree" +CADDY_CONFIG="/etc/caddy/caddy.conf" +CADDY_OPTS="run -config $CADDY_CONFIG" diff --git a/community/caddy/caddy.initd b/community/caddy/caddy.initd index 8e4dae22da..d0cd12c524 100644 --- a/community/caddy/caddy.initd +++ b/community/caddy/caddy.initd @@ -15,7 +15,7 @@ depend() { checkconfig() { ebegin "Checking configuration for $RC_SVCNAME" - su -s /bin/sh ${command_user%:*} -c "$command $command_args -validate" + su -s /bin/sh ${command_user%:*} -c "$command validate -config $CADDY_CONFIG" eend $? } -- 2.27.0