diff options
| author | Kerma Gérald <gandalf@gk2.net> | 2022-01-07 14:41:00 +0100 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2022-01-09 13:44:20 -0800 |
| commit | b4f48b5c23d0b5d2ab9de2041edbf69a8f6ca013 (patch) | |
| tree | 5123e60578e1a9a3359c83f12ad2ff90e6dc0c0a /net/crowdsec-firewall-bouncer | |
| parent | e660ac3398ccd76300d14aee80f5da9766cc8a85 (diff) | |
crowdsec-firewall-bouncer: update to 0.0.21
Update crowdsec-firewall-bouncer to latest upstream release version 0.0.21
Makefile rework
- use tagged version for download
Fixes
- set API_KEY in firewall bouncer config file
Signed-off-by: Kerma Gérald <gandalf@gk2.net>
Diffstat (limited to 'net/crowdsec-firewall-bouncer')
3 files changed, 18 insertions, 22 deletions
diff --git a/net/crowdsec-firewall-bouncer/Makefile b/net/crowdsec-firewall-bouncer/Makefile index 29a9251a6..bc9c62bd8 100644 --- a/net/crowdsec-firewall-bouncer/Makefile +++ b/net/crowdsec-firewall-bouncer/Makefile @@ -1,19 +1,17 @@ # SPDX-License-Identifier: MIT # -# Copyright (C) 2021 Gerald Kerma +# Copyright (C) 2021-2022 Gerald Kerma # include $(TOPDIR)/rules.mk PKG_NAME:=crowdsec-firewall-bouncer -PKG_VERSION:=0.0.18 +PKG_VERSION:=0.0.21 PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/crowdsecurity/cs-firewall-bouncer -PKG_MIRROR_HASH:=2fb7ddb226f6a99c46826706da25f7cdbcd7615468129e7b07f8ac4edf0366f9 -PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_SOURCE_DATE:=20211210 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/cs-firewall-bouncer/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=c92e02085c4c8481009a46ba80374329d102a45933fd0fd2164901954331923e PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE @@ -22,23 +20,21 @@ PKG_MAINTAINER:=Gerald Kerma <gandalf@gk2.net> PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_DIR:=$(BUILD_DIR)/cs-firewall-bouncer-$(PKG_VERSION) -CSFB_BUILD_VERSION?=$(PKG_SOURCE_VERSION) -CSFB_BUILD_GOVERSION=$(shell go version | cut -d " " -f3 | sed -r 's/[go]+//g') -CWD_BUILD_TIMESTAMP:=$(SOURCE_DATE_EPOCH) -CSFB_BUILD_TAG=openwrt - +CSFB_BUILD_VERSION?=v$(PKG_VERSION) +CSFB_BUILD_GOVERSION:=$(shell go version | cut -d " " -f3 | sed -E 's/[go]+//g') +CWD_BUILD_TIMESTAMP:=$(shell date +%F"_"%T) +CSFB_BUILD_TAG:=openwrt-$(PKG_VERSION)-$(PKG_RELEASE) CSFB_VERSION_PKG:=github.com/crowdsecurity/cs-firewall-bouncer/pkg/version GO_PKG:=github.com/crowdsecurity/cs-firewall-bouncer - +GO_PKG_INSTALL_ALL:=1 GO_PKG_LDFLAGS_X:=$(CSFB_VERSION_PKG).Version=$(CSFB_BUILD_VERSION) \ $(CSFB_VERSION_PKG).BuildDate=$(CSFB_BUILD_TIMESTAMP) \ $(CSFB_VERSION_PKG).Tag=$(CSFB_BUILD_TAG) \ $(CSFB_VERSION_PKG).GoVersion=$(CSFB_BUILD_GOVERSION) -GO_PKG_INSTALL_ALL:=1 - include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk @@ -46,7 +42,7 @@ define Package/crowdsec-firewall-bouncer/Default SECTION:=net CATEGORY:=Network TITLE:=Firewall bouncer for Crowdsec - URL:=https://github.com/crowdsecurity/cs-firewall-bouncer/ + URL:=https://github.com/crowdsecurity/crowdsec-firewall-bouncer/ endef define Package/crowdsec-firewall-bouncer diff --git a/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.defaults b/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.defaults index b4fed85fa..64d69a2f1 100644 --- a/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.defaults +++ b/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.defaults @@ -1,13 +1,13 @@ #!/bin/sh -API_KEY="" + CONFIG=/etc/crowdsec/bouncers/crowdsec-firewall-bouncer.yaml ## Gen&ConfigApiKey -if grep -q "${API_KEY}" "$CONFIG"; then - echo API key already registered... -else +if grep -q "{API_KEY}" "$CONFIG"; then SUFFIX=`tr -dc A-Za-z0-9 </dev/urandom | head -c 8` - API_KEY=`/usr/bin/cscli bouncers add cs-firewall-bouncer-${SUFFIX} -o raw` + API_KEY=`/usr/bin/cscli bouncers add crowdsec-firewall-bouncer-${SUFFIX} -o raw` sed -i "s,^\(\s*api_key\s*:\s*\).*\$,\1$API_KEY," $CONFIG +else + echo API key already registered... fi # unfortunately, UCI doesn't provide a nice way to add an anonymous section only if it doesn't already exist diff --git a/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.initd b/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.initd index 3e83df044..f720e366a 100755 --- a/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.initd +++ b/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.initd @@ -4,7 +4,7 @@ START=99 USE_PROCD=1 NAME=crowdsec-firewall-bouncer -PROG=/usr/bin/cs-firewall-bouncer +PROG=/usr/bin/crowdsec-firewall-bouncer CONFIG=/etc/crowdsec/bouncers/crowdsec-firewall-bouncer.yaml BACKEND=iptables VARCONFIGDIR=/var/etc/crowdsec/bouncers |