From 3d7791d57527930371dfe266ebf409f76c1166ae Mon Sep 17 00:00:00 2001
From: Stephane de Labrusse <stephdl@de-labrusse.fr>
Date: Fri, 26 Apr 2024 13:22:14 +0200
Subject: [PATCH] Update crowdsec image version to v1.6.1-2-debian and remove
 hub update and upgrade (#42)

* Update crowdsec image version to v1.6.1-2-debian
* Remove hub update and upgrade to avoid rate limit
* Update crowdsec-upgrade-hub.timer with adjusted timing settings
---
 build-images.sh                              | 2 +-
 imageroot/actions/create-module/10initialize | 3 ---
 imageroot/crowdsec-upgrade-hub.timer         | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/build-images.sh b/build-images.sh
index cc57449..a48b27b 100644
--- a/build-images.sh
+++ b/build-images.sh
@@ -71,7 +71,7 @@ buildah add "${container}" ui/dist /ui
 buildah config --entrypoint=/ \
     --label="org.nethserver.authorizations=" \
     --label="org.nethserver.rootfull=1" \
-    --label="org.nethserver.images=docker.io/crowdsecurity/crowdsec:v1.6.0-1-debian ${repobase}/crowdsec-firewall-bouncer:${IMAGETAG:-latest}" \
+    --label="org.nethserver.images=docker.io/crowdsecurity/crowdsec:v1.6.1-2-debian ${repobase}/crowdsec-firewall-bouncer:${IMAGETAG:-latest}" \
     --label="org.nethserver.tcp-ports-demand=2" \
     "${container}"
 # Commit the image
diff --git a/imageroot/actions/create-module/10initialize b/imageroot/actions/create-module/10initialize
index ace926b..f6b90ed 100755
--- a/imageroot/actions/create-module/10initialize
+++ b/imageroot/actions/create-module/10initialize
@@ -26,9 +26,6 @@ systemctl enable --now "${MODULE_ID}.service"
 systemctl enable --now "${MODULE_ID}-upgrade-hub.timer"
 
 # Install default collections
-podman exec -i ${MODULE_ID} cscli hub update
-podman exec -i ${MODULE_ID} cscli hub upgrade
-
 podman exec -i ${MODULE_ID} cscli collections install \
     crowdsecurity/apache2 \
     crowdsecurity/base-http-scenarios \
diff --git a/imageroot/crowdsec-upgrade-hub.timer b/imageroot/crowdsec-upgrade-hub.timer
index 0b3ab5f..03485cc 100644
--- a/imageroot/crowdsec-upgrade-hub.timer
+++ b/imageroot/crowdsec-upgrade-hub.timer
@@ -2,7 +2,7 @@
 Description=Timer of crowdsec hub update
 
 [Timer]
-OnActiveSec=15 minutes
+OnActiveSec=4 hours
 OnUnitInactiveSec=15 days
 
 [Install]