diff --git a/Makefile b/Makefile index df4c3482..0d5f2ade 100644 --- a/Makefile +++ b/Makefile @@ -209,58 +209,6 @@ cloudflared-darwin-amd64.tgz: cloudflared tar czf cloudflared-darwin-amd64.tgz cloudflared rm cloudflared -.PHONY: cloudflared-junos -cloudflared-junos: cloudflared jetez-certificate.pem jetez-key.pem - jetez --source . \ - -j jet.yaml \ - --key jetez-key.pem \ - --cert jetez-certificate.pem \ - --version $(VERSION) - rm jetez-*.pem - -jetez-certificate.pem: -ifndef JETEZ_CERT - $(error JETEZ_CERT not defined) -endif - @echo "Writing JetEZ certificate" - @echo "$$JETEZ_CERT" > jetez-certificate.pem - -jetez-key.pem: -ifndef JETEZ_KEY - $(error JETEZ_KEY not defined) -endif - @echo "Writing JetEZ key" - @echo "$$JETEZ_KEY" > jetez-key.pem - -.PHONY: publish-cloudflared-junos -publish-cloudflared-junos: cloudflared-junos cloudflared-x86-64.latest.s3 -ifndef S3_ENDPOINT - $(error S3_HOST not defined) -endif -ifndef S3_URI - $(error S3_URI not defined) -endif -ifndef S3_ACCESS_KEY - $(error S3_ACCESS_KEY not defined) -endif -ifndef S3_SECRET_KEY - $(error S3_SECRET_KEY not defined) -endif - sha256sum cloudflared-x86-64-$(VERSION).tgz | awk '{printf $$1}' > cloudflared-x86-64-$(VERSION).tgz.shasum - s4cmd --endpoint-url $(S3_ENDPOINT) --force --API-GrantRead=uri=http://acs.amazonaws.com/groups/global/AllUsers \ - put cloudflared-x86-64-$(VERSION).tgz $(S3_URI)/cloudflared-x86-64-$(VERSION).tgz - s4cmd --endpoint-url $(S3_ENDPOINT) --force --API-GrantRead=uri=http://acs.amazonaws.com/groups/global/AllUsers \ - put cloudflared-x86-64-$(VERSION).tgz.shasum $(S3_URI)/cloudflared-x86-64-$(VERSION).tgz.shasum - dpkg --compare-versions "$(VERSION)" gt "$(shell cat cloudflared-x86-64.latest.s3)" && \ - echo -n "$(VERSION)" > cloudflared-x86-64.latest && \ - s4cmd --endpoint-url $(S3_ENDPOINT) --force --API-GrantRead=uri=http://acs.amazonaws.com/groups/global/AllUsers \ - put cloudflared-x86-64.latest $(S3_URI)/cloudflared-x86-64.latest || \ - echo "Latest version not updated" - -cloudflared-x86-64.latest.s3: - s4cmd --endpoint-url $(S3_ENDPOINT) --force \ - get $(S3_URI)/cloudflared-x86-64.latest cloudflared-x86-64.latest.s3 - .PHONY: homebrew-upload homebrew-upload: cloudflared-darwin-amd64.tgz aws s3 --endpoint-url $(S3_ENDPOINT) cp --acl public-read $$^ $(S3_URI)/cloudflared-$$(VERSION)-$1.tgz diff --git a/cfsetup.yaml b/cfsetup.yaml index e75af46b..4c216eff 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -254,35 +254,6 @@ buster: &buster pre-cache: *install_pygithub post-cache: - make github-message - build-junos: - build_dir: *build_dir - builddeps: - - *pinned_go - - build-essential - - python3 - - genisoimage - pre-cache: - - ln -s /usr/bin/genisoimage /usr/bin/mkisofs - post-cache: - - export CGO_ENABLED=0 - - export GOOS=freebsd - - export GOARCH=amd64 - - make cloudflared - publish-junos: - build_dir: *build_dir - builddeps: - - *pinned_go - - build-essential - - python3 - - genisoimage - - jetez - - s4cmd - pre-cache: - - ln -s /usr/bin/genisoimage /usr/bin/mkisofs - post-cache: - - export GOOS=freebsd - - export GOARCH=amd64 - - make publish-cloudflared-junos bullseye: *buster bookworm: *buster diff --git a/jet.yaml b/jet.yaml deleted file mode 100644 index 2b5b728c..00000000 --- a/jet.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -basename: "cloudflared" -comment: "Cloudflare Tunnel" -copyright: "Cloudflare, Inc" -arch: "x86" -abi: "64" -files: - - source: cloudflared - destination: /var/db/scripts/jet/cloudflared