From f8ebb1e783da6d2928907d0609b0c876b80c137b Mon Sep 17 00:00:00 2001 From: Maksim Karasev Date: Sun, 3 Jul 2022 15:33:34 +0300 Subject: [PATCH] Add cloudflared (#5333) * Add cloudflared * Update icon filename --- cross/cloudflared/Makefile | 23 ++++++++++++++++++++++ cross/cloudflared/PLIST | 1 + cross/cloudflared/digests | 3 +++ spk/cloudflared/Makefile | 23 ++++++++++++++++++++++ spk/cloudflared/src/cloudflared.png | Bin 0 -> 6303 bytes spk/cloudflared/src/service-setup.sh | 18 +++++++++++++++++ spk/cloudflared/src/wizard/install_uifile | 20 +++++++++++++++++++ 7 files changed, 88 insertions(+) create mode 100644 cross/cloudflared/Makefile create mode 100644 cross/cloudflared/PLIST create mode 100644 cross/cloudflared/digests create mode 100644 spk/cloudflared/Makefile create mode 100644 spk/cloudflared/src/cloudflared.png create mode 100644 spk/cloudflared/src/service-setup.sh create mode 100644 spk/cloudflared/src/wizard/install_uifile diff --git a/cross/cloudflared/Makefile b/cross/cloudflared/Makefile new file mode 100644 index 00000000000..e3bd3092992 --- /dev/null +++ b/cross/cloudflared/Makefile @@ -0,0 +1,23 @@ +PKG_NAME = cloudflared +PKG_VERS = 2022.6.3 +PKG_EXT = tar.gz +PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/cloudflare/cloudflared/archive +PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +BUILD_DEPENDS = native/go + +HOMEPAGE = https://github.com/cloudflare/cloudflared +COMMENT = Cloudflare Tunnel client (formerly Argo Tunnel) +LICENSE = Apache-2.0 + +GO_SRC_DIR = $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS) +GO_BIN_DIR = $(GO_SRC_DIR)/$(PKG_NAME) +COMPILE_TARGET = cloudflared_compile + +include ../../mk/spksrc.cross-go.mk + +.PHONY: cloudflared_compile +cloudflared_compile: + @$(RUN) $(MAKE) VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared diff --git a/cross/cloudflared/PLIST b/cross/cloudflared/PLIST new file mode 100644 index 00000000000..45c18be2e24 --- /dev/null +++ b/cross/cloudflared/PLIST @@ -0,0 +1 @@ +bin:bin/cloudflared diff --git a/cross/cloudflared/digests b/cross/cloudflared/digests new file mode 100644 index 00000000000..2f6929bee71 --- /dev/null +++ b/cross/cloudflared/digests @@ -0,0 +1,3 @@ +cloudflared-2022.6.3.tar.gz SHA1 9bd0a13a8f873edb507d3ffafaa1600facdce73a +cloudflared-2022.6.3.tar.gz SHA256 74fb20e78f69db086f6044eae9d7a09bb3b59001a14d17c18edd9cb4ee8db4f6 +cloudflared-2022.6.3.tar.gz MD5 458f453543f4c400ed16598666866471 diff --git a/spk/cloudflared/Makefile b/spk/cloudflared/Makefile new file mode 100644 index 00000000000..74edcba06e6 --- /dev/null +++ b/spk/cloudflared/Makefile @@ -0,0 +1,23 @@ +SPK_NAME = cloudflared +SPK_VERS = 2022.6.3 +SPK_REV = 1 +SPK_ICON = src/cloudflared.png +DSM_UI_DIR = app + +DEPENDS = cross/$(SPK_NAME) +UNSUPPORTED_ARCHS = $(PPC_ARCHS) + +MAINTAINER = karasevm +DISPLAY_NAME = cloudflared +DESCRIPTION = Cloudflare Tunnel client (formerly Argo Tunnel). +HOMEPAGE = https://github.com/cloudflare/cloudflared +LICENSE = Apache-2.0 +CHANGELOG = "Initial package release." + +WIZARDS_DIR = src/wizard/ + +STARTABLE = yes +SERVICE_USER = auto +SERVICE_SETUP = src/service-setup.sh + +include ../../mk/spksrc.spk.mk diff --git a/spk/cloudflared/src/cloudflared.png b/spk/cloudflared/src/cloudflared.png new file mode 100644 index 0000000000000000000000000000000000000000..dd5d5aea54daaefaa008b492402cec6507b6c396 GIT binary patch literal 6303 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 ${TOKEN_FILE} + fi +} diff --git a/spk/cloudflared/src/wizard/install_uifile b/spk/cloudflared/src/wizard/install_uifile new file mode 100644 index 00000000000..5003416ee10 --- /dev/null +++ b/spk/cloudflared/src/wizard/install_uifile @@ -0,0 +1,20 @@ +[ + { + "step_title": "Tunnel configuration", + "items": [ + { + "type": "textfield", + "desc": "Token for the cloudflare tunnel", + "subitems": [ + { + "key": "wizard_cloudflared_token", + "desc": "Tunnel token", + "validator": { + "allowBlank": false + } + } + ] + } + ] + } +]