From 176106451465a99f4e58d1676ab81fd108a87f29 Mon Sep 17 00:00:00 2001
From: acooler15 <renzongjia@vip.qq.com>
Date: Thu, 11 Feb 2021 11:54:15 +0800
Subject: [PATCH] update uacme to 1.6-1 adopt to new behavior of nginx

---
 net/uacme/Makefile     |  6 +++---
 net/uacme/files/run.sh | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/net/uacme/Makefile b/net/uacme/Makefile
index c6963ef3..55ce59f8 100644
--- a/net/uacme/Makefile
+++ b/net/uacme/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uacme
-PKG_VERSION:=1.2.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ndilieto/uacme/tar.gz/upstream/$(PKG_VERSION)?
-PKG_HASH:=ccd6001e96ec2eb22a1d557bf8dcc4152a567782afc9a1e017a93d7de3b49833
+PKG_HASH:=baeb1621e4b5d3cbf339531aa8c0df29ccffbb9c996379265349976d2c09c259
 
 PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
diff --git a/net/uacme/files/run.sh b/net/uacme/files/run.sh
index 20b4076a..aafcad82 100644
--- a/net/uacme/files/run.sh
+++ b/net/uacme/files/run.sh
@@ -355,7 +355,23 @@ issue_cert()
 	# commit and reload is in post_checks
     fi
 
-    if [ -e /etc/init.d/nginx ] && [ "$update_nginx" -eq "1" ]; then
+    local nginx_updated
+    nginx_updated=0
+    if command -v nginx-util 2>/dev/null && [ "$update_nginx" -eq "1" ]; then
+	nginx_updated=1
+	for domain in $domains; do
+	    if [ "$APP" = "uacme" ]; then
+		nginx-util add_ssl "${domain}" uacme "$STATE_DIR/${main_domain}/cert.pem" \
+		    "$STATE_DIR/private/${main_domain}/key.pem" || nginx_updated=0
+	    else
+		nginx-util add_ssl "${domain}" acme "$STATE_DIR/${main_domain}/fullchain.cer" \
+		    "$STATE_DIR/${main_domain}/${main_domain}.key" || nginx_updated=0
+	    fi
+	done
+	# reload is in post_checks
+    fi
+
+    if [ "$nginx_updated" -eq "0" ] && [ -w /etc/nginx/nginx.conf ] && [ "$update_nginx" -eq "1" ]; then
 	if [ "$APP" = "uacme" ]; then
 	    sed -i "s#ssl_certificate\ .*#ssl_certificate $STATE_DIR/${main_domain}/cert.pem;#g" /etc/nginx/nginx.conf
 	    sed -i "s#ssl_certificate_key\ .*#ssl_certificate_key $STATE_DIR/private/${main_domain}/key.pem;#g" /etc/nginx/nginx.conf