Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

acme: update to 2.9.0

Browse source 
Switch to AUTORELEASE to avoid bumping PKG_RELEASE all the time.

Run shell scripts through shfmt -w -ci -bn -sr -s in order to have a
standard style.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2021-06-25 21:58:01 -07:00
parent d2867fe2c7
commit f6ef44044d
3 changed files with 24 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/acme/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=acme
PKG_VERSION:=2.8.7
PKG_RELEASE:=6
PKG_VERSION:=2.9.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?
PKG_HASH:=774010429730882f6bbfcd3756ff0fa755846106664841092af828a814159861
PKG_HASH:=bb8cfb8333bc9e986bb8b7644d518bc238b353c871c343b7edf8cda7b7dd903c
PKG_BUILD_DIR:=$(BUILD_DIR)/acme.sh-$(PKG_VERSION)
PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>

6
net/acme/files/acme.init
View file

@ -5,8 +5,7 @@ USE_PROCD=1
START=50
SCRIPT=/usr/lib/acme/run-acme
start_service()
{
start_service() {
procd_open_instance
procd_set_param command $SCRIPT
procd_set_param file /etc/config/acme
@ -29,7 +28,6 @@ boot() {
start
}
service_triggers()
{
service_triggers() {
procd_add_reload_trigger acme
}

37
net/acme/files/run.sh
View file

@ -24,25 +24,21 @@ USER_CLEANUP=
. /lib/functions.sh
check_cron()
{
check_cron() {
[ -f "/etc/crontabs/root" ] && grep -q '/etc/init.d/acme' /etc/crontabs/root && return
echo "0 0 * * * /etc/init.d/acme start" >> /etc/crontabs/root
/etc/init.d/cron start
}
log()
{
log() {
logger -t acme -s -p daemon.info -- "$@"
}
err()
{
err() {
logger -t acme -s -p daemon.err -- "$@"
}
debug()
{
debug() {
[ "$DEBUG" -eq "1" ] && logger -t acme -s -p daemon.debug -- "$@"
}
@ -55,14 +51,12 @@ get_listeners() {
done
}
run_acme()
{
run_acme() {
debug "Running acme.sh as '$ACME $@'"
$ACME "$@"
}
pre_checks()
{
pre_checks() {
main_domain="$1"
log "Running pre checks for $main_domain."
@ -138,8 +132,7 @@ pre_checks()
return 0
}
post_checks()
{
post_checks() {
log "Running post checks (cleanup)."
# The comment ensures we only touch our own rules. If no rules exist, that
# is fine, so hide any errors
@ -166,21 +159,18 @@ post_checks()
fi
}
err_out()
{
err_out() {
post_checks
exit 1
}
int_out()
{
int_out() {
post_checks
trap - INT
kill -INT $$
}
is_staging()
{
is_staging() {
local main_domain
local domain_dir
main_domain="$1"
@ -190,8 +180,7 @@ is_staging()
return $?
}
issue_cert()
{
issue_cert() {
local section="$1"
local acme_args=
local enabled
@ -275,7 +264,6 @@ issue_cert()
fi
fi
acme_args="$acme_args $(for d in $domains; do echo -n "-d $d "; done)"
acme_args="$acme_args --keylength $keylength"
[ -n "$ACCOUNT_EMAIL" ] && acme_args="$acme_args --accountemail $ACCOUNT_EMAIL"
@ -355,8 +343,7 @@ issue_cert()
post_checks
}
load_vars()
{
load_vars() {
local section="$1"
STATE_DIR=$(config_get "$section" state_dir)