Merge pull request crowdsecurity#17 from crowdsecurity/add_bouncers_folder

add bouncers sub-folder

Author: AlteredCoder

README.md

@@ -84,10 +84,10 @@ custom_binary.sh del 1.2.3.4/32 3600 "test blacklist"
 ## Configuration
 
 Before starting the `crowdsec-custom-bouncer` service, please edit the configuration to add your API url and key.
-The default configuration file is located under : `/etc/crowdsec/crowdsec-custom-bouncer/`
+The default configuration file is located under : `/etc/crowdsec/bouncers/`
 
 ```sh
-$ vim /etc/crowdsec/custom-bouncer/crowdsec-custom-bouncer.yaml
+$ vim /etc/crowdsec/bouncers/crowdsec-custom-bouncer.yaml
 ```
 
 ```yaml

debian/postinst

@@ -22,12 +22,12 @@ fi
 
 
 TMP=`mktemp -p /tmp/`
-cp /etc/crowdsec/crowdsec-custom-bouncer/crowdsec-custom-bouncer.yaml ${TMP}
-API_KEY=${API_KEY} envsubst < ${TMP} > /etc/crowdsec/crowdsec-custom-bouncer/crowdsec-custom-bouncer.yaml
+cp /etc/crowdsec/bouncers/crowdsec-custom-bouncer.yaml ${TMP}
+API_KEY=${API_KEY} envsubst < ${TMP} > /etc/crowdsec/bouncers/crowdsec-custom-bouncer.yaml
 rm ${TMP}
 
 if [ ${START} -eq 0 ] ; then
     echo "no api key was generated"
 fi
 
-echo "please enter the binary path in '/etc/crowdsec/crowdsec-custom-bouncer/crowdsec-custom-bouncer.yaml' and start the bouncer via 'sudo systemctl start crowdsec-custom-bouncer' "
+echo "please enter the binary path in '/etc/crowdsec/bouncers/crowdsec-custom-bouncer.yaml' and start the bouncer via 'sudo systemctl start crowdsec-custom-bouncer' "

debian/rules

@@ -18,6 +18,6 @@ override_dh_auto_install:
 	mkdir -p debian/crowdsec-custom-bouncer/usr/sbin
 	cp crowdsec-custom-bouncer  debian/crowdsec-custom-bouncer/usr/sbin
 	mkdir -p debian/crowdsec-custom-bouncer/etc/systemd/system/
-	mkdir -p debian/crowdsec-custom-bouncer/etc/crowdsec/crowdsec-custom-bouncer/
-	BIN=/sbin/crowdsec-custom-bouncer CFG=/etc/crowdsec/crowdsec-custom-bouncer envsubst < config/crowdsec-custom-bouncer.service >  debian/crowdsec-custom-bouncer/etc/systemd/system/crowdsec-custom-bouncer.service
-	cp config/crowdsec-custom-bouncer.yaml debian/crowdsec-custom-bouncer/etc/crowdsec/crowdsec-custom-bouncer/
+	mkdir -p debian/crowdsec-custom-bouncer/etc/crowdsec/bouncers/
+	BIN=/sbin/crowdsec-custom-bouncer CFG=/etc/crowdsec/bouncers envsubst < config/crowdsec-custom-bouncer.service >  debian/crowdsec-custom-bouncer/etc/systemd/system/crowdsec-custom-bouncer.service
+	cp config/crowdsec-custom-bouncer.yaml debian/crowdsec-custom-bouncer/etc/crowdsec/bouncers/

rpm/SPECS/crowdsec-custom-bouncer.spec

@@ -37,7 +37,7 @@ rm ${TMP}
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/sbin
 install -m 755 -D %{name}  %{buildroot}%{_bindir}/%{name}
-install -m 600 -D config/%{name}.yaml %{buildroot}/etc/crowdsec/%{name}/%{name}.yaml 
+install -m 600 -D config/%{name}.yaml %{buildroot}/etc/crowdsec/bouncers/%{name}.yaml 
 install -m 644 -D config/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
 
 %clean
@@ -47,7 +47,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 /usr/bin/%{name}
 %{_unitdir}/%{name}.service
-%config(noreplace) /etc/crowdsec/%{name}/%{name}.yaml 
+%config(noreplace) /etc/crowdsec/bouncers/%{name}.yaml 
 
 
 %post
@@ -73,15 +73,15 @@ if [ "$?" -eq "0" ] ; then
 fi
 
 TMP=`mktemp -p /tmp/`
-cp /etc/crowdsec/crowdsec-custom-bouncer/crowdsec-custom-bouncer.yaml ${TMP}
-API_KEY=${API_KEY} envsubst < ${TMP} > /etc/crowdsec/crowdsec-custom-bouncer/crowdsec-custom-bouncer.yaml
+cp /etc/crowdsec/bouncers/crowdsec-custom-bouncer.yaml ${TMP}
+API_KEY=${API_KEY} envsubst < ${TMP} > /etc/crowdsec/bouncers/crowdsec-custom-bouncer.yaml
 rm ${TMP}
 
 if [ ${START} -eq 0 ] ; then
     echo "no api key was generated, won't start service"
 fi
 
-echo "please enter the binary path in '/etc/crowdsec/crowdsec-custom-bouncer/crowdsec-custom-bouncer.yaml' and start the bouncer via 'sudo systemctl start crowdsec-custom-bouncer' "
+echo "please enter the binary path in '/etc/crowdsec/bouncers/crowdsec-custom-bouncer.yaml' and start the bouncer via 'sudo systemctl start crowdsec-custom-bouncer' "
 
 
 

scripts/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 BIN_PATH_INSTALLED="/usr/local/bin/crowdsec-custom-bouncer"
 BIN_PATH="./crowdsec-custom-bouncer"
-CONFIG_DIR="/etc/crowdsec/crowdsec-custom-bouncer/"
+CONFIG_DIR="/etc/crowdsec/bouncers/"
 PID_DIR="/var/run/crowdsec/"
 SYSTEMD_PATH_FILE="/etc/systemd/system/crowdsec-custom-bouncer.service"
 API_KEY=""

scripts/uninstall.sh

@@ -2,12 +2,12 @@
 
 SYSTEMD_PATH_FILE="/etc/systemd/system/crowdsec-custom-bouncer.service"
 LOG_FILE="/var/log/crowdsec-custom-bouncer.log"
-CONFIG_DIR="/etc/crowdsec/crowdsec-custom-bouncer/"
+CONFIG_DIR="/etc/crowdsec/bouncers"
 BIN_PATH_INSTALLED="/usr/local/bin/crowdsec-custom-bouncer"
 
 uninstall() {
 	systemctl stop crowdsec-custom-bouncer
-	rm -rf "${CONFIG_DIR}"
+	rm -f "${CONFIG_DIR}/crowdsec-custom-bouncer.yaml"
 	rm -f "${SYSTEMD_PATH_FILE}"
 	rm -f "${BIN_PATH_INSTALLED}"
 	rm -f "${LOG_FILE}"