Skip to content

Commit 48d06d8

Browse files
committed
uacme: use acme-common
Signed-off-by: Seo Suchan <tjtncks@gmail.com>
1 parent d5ddd6b commit 48d06d8

File tree

8 files changed

+1627
-608
lines changed

8 files changed

+1627
-608
lines changed

net/uacme/Makefile

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
1919
PKG_LICENSE:=GPL-3.0-or-later
2020
PKG_LICENSE_FILES:=COPYING
2121

22-
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-upstream-$(PKG_VERSION)
22+
PKG_BUILD_DIR:=$(BUILD_DIR)/uacme-upstream-$(PKG_VERSION)
2323
PKG_INSTALL:=1
2424
PKG_BUILD_PARALLEL:=1
2525

@@ -46,7 +46,7 @@ define Package/uacme
4646
$(call Package/uacme/Default)
4747
SECTION:=net
4848
CATEGORY:=Network
49-
DEPENDS:=+libcurl +LIBCURL_WOLFSSL:libmbedtls
49+
DEPENDS:=+libcurl +LIBCURL_WOLFSSL:libmbedtls +acme-common
5050
TITLE:=lightweight client for ACMEv2
5151
Menu:=1
5252
endef
@@ -100,30 +100,24 @@ define Package/uacme/install
100100
$(INSTALL_DIR) \
101101
$(1)/usr/sbin \
102102
$(1)/etc/acme \
103-
$(1)/etc/config \
104-
$(1)/etc/init.d \
105-
$(1)/usr/share/uacme
103+
$(1)/usr/share/uacme \
104+
$(1)/usr/lib/acme/client
106105

106+
$(INSTALL_BIN) ./files/hook.sh $(1)/usr/lib/acme/hook
107+
$(INSTALL_BIN) ./files/dnschalhook.sh $(1)/usr/lib/acme/client/dnschalhook.sh
108+
$(INSTALL_BIN) ./files/httpchalhook.sh $(1)/usr/lib/acme/client/httpchalhook.sh
109+
$(INSTALL_BIN) ./files/dnsapi_helper.sh $(1)/usr/lib/acme/client/dnsapi_helper.sh
107110
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uacme $(1)/usr/sbin/uacme
108-
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/uacme/uacme.sh $(1)/usr/share/uacme/
109-
$(SED) '/^CHALLENGE_PATH=/d' $(1)/usr/share/uacme/uacme.sh
110-
$(INSTALL_CONF) ./files/acme.config $(1)/etc/config/acme
111-
$(INSTALL_BIN) ./files/run.sh $(1)/usr/share/uacme/run-uacme
112-
$(INSTALL_BIN) ./files/acme.init $(1)/etc/init.d/acme
113111
endef
114112

115113
define Package/uacme-ualpn/install
116114
$(INSTALL_DIR) \
117115
$(1)/usr/sbin \
118-
$(1)/usr/share/uacme
116+
$(1)/usr/share/uacme \
117+
$(1)/usr/lib/acme/client
119118

120119
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ualpn $(1)/usr/sbin/ualpn
121-
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ualpn.sh $(1)/usr/share/uacme/
122-
endef
123-
124-
define Package/uacme/prerm
125-
#!/bin/sh
126-
sed -i '/\/etc\/init\.d\/acme start/d' /etc/crontabs/root
120+
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ualpn.sh $(1)/usr/lib/acme/client/ualpn.sh
127121
endef
128122

129123
$(eval $(call BuildPackage,uacme))

net/uacme/files/acme.config

Lines changed: 0 additions & 16 deletions
This file was deleted.

net/uacme/files/acme.init

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)