Merge 0fc86ea99d into 498109addb

Bump vite from 5.4.8 to 5.4.14 in /docs

Jenkinsfile

@@ -128,7 +128,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'testing/results') {
+					dir(path: 'test/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}
@@ -161,7 +161,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'testing/results') {
+					dir(path: 'test/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}
@@ -199,7 +199,7 @@ pipeline {
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
 				unstable {
-					dir(path: 'testing/results') {
+					dir(path: 'test/results') {
 						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
 					}
 				}

backend/internal/access-list.js

@@ -258,6 +258,7 @@ const internalAccessList = {
 					})
 					.where('access_list.is_deleted', 0)
 					.andWhere('access_list.id', data.id)
+					.groupBy('access_list.id')
 					.allowGraph('[owner,items,clients,proxy_hosts.[certificate,access_list.[clients,items]]]')
 					.first();
 

docker/docker-compose.ci.yml

@@ -40,7 +40,7 @@ services:
           - ca.internal
 
   pdns:
-    image: pschiffe/pdns-mysql
+    image: pschiffe/pdns-mysql:4.8
     volumes:
       - '/etc/localtime:/etc/localtime:ro'
     environment:

docker/docker-compose.dev.yml

@@ -132,7 +132,7 @@ services:
       - 8128:3128
 
   pdns:
-    image: pschiffe/pdns-mysql
+    image: pschiffe/pdns-mysql:4.8
     container_name: npm2dev.pdns
     volumes:
       - '/etc/localtime:/etc/localtime:ro'
@@ -218,7 +218,7 @@ services:
     env_file:
       - ci.env
     ports:
-      - 9000:9000 
+      - 9000:9000
     depends_on:
       - authentik-redis
       - db-postgres

docker/rootfs/etc/s6-overlay/s6-rc.d/cs-crowdsec-bouncer/script.sh

@@ -0,0 +1,54 @@
+#!/command/with-contenv bash
+
+set -e # Exit immediately if a command exits with a non-zero status.
+
+function set_properties() {
+  sed -i "s,^$1=.*,$1=$2,g" "${3}"
+}
+
+echo "Deploy Crowdsec Openresty Bouncer.." 
+if [ -n "${CROWDSEC_OPENRESTY_BOUNCER}" ]; then
+   while IFS= read -r line
+   do 
+      if ! [[ "$line" != "^#" ]] || [[ "$line" != "^\n" ]]; then
+        name=$(echo "$line" | cut -d "=" -f1)
+        value=$(echo "$line" | cut -d "=" -f2)
+        if grep -q "${name}" /defaults/crowdsec/crowdsec-openresty-bouncer.conf ; then
+          set_properties "${name}" "${value}" "/defaults/crowdsec/crowdsec-openresty-bouncer.conf"
+        fi
+      fi
+   done <<< "${CROWDSEC_OPENRESTY_BOUNCER}"
+else
+	mkdir -p /data/crowdsec/templates
+	sed -i 's|/defaults/crowdsec|/data/crowdsec|' /etc/nginx/conf.d/crowdsec_openresty.conf
+
+	if [ -f /data/crowdsec/crowdsec-openresty-bouncer.conf ]; then
+		echo "Patch crowdsec-openresty-bouncer.conf .." 
+		sed "s/=.*//g" /data/crowdsec/crowdsec-openresty-bouncer.conf > /tmp/crowdsec.conf.raw
+		sed "s/=.*//g" /defaults/crowdsec/crowdsec-openresty-bouncer.conf > /tmp/crowdsec-openresty-bouncer.conf.raw
+		if grep -vf /tmp/crowdsec.conf.raw /tmp/crowdsec-openresty-bouncer.conf.raw ; then
+			grep -vf /tmp/crowdsec.conf.raw /tmp/crowdsec-openresty-bouncer.conf.raw > /tmp/config.newvals
+			cp /data/crowdsec/crowdsec-openresty-bouncer.conf /data/crowdsec/crowdsec-openresty-bouncer.conf.bak
+			grep -f /tmp/config.newvals /defaults/crowdsec/crowdsec-openresty-bouncer.conf >> /data/crowdsec/crowdsec-openresty-bouncer.conf
+		fi
+	else
+		echo "Deploy new crowdsec-openresty-bouncer.conf .." 
+		cp /defaults/crowdsec/crowdsec-openresty-bouncer.conf /data/crowdsec/crowdsec-openresty-bouncer.conf    
+	fi
+	#Make sure the config location is where we get the config from instead of /default/
+	sed -i 's|/defaults/crowdsec|/data/crowdsec|' /data/crowdsec/crowdsec-openresty-bouncer.conf
+fi
+
+
+#Make sure we only copy files that don't exist in /data/crowdsec.
+if [ -d "/data/crowdsec/templates" ]; then
+    echo "Deploy Crowdsec Templates .."
+    cd /defaults/crowdsec/templates/
+    for file in *.html
+    do
+        if [ ! -e "/data/crowdsec/templates/${file}" ]
+        then
+            cp -r "/defaults/crowdsec/templates/${file}" "/data/crowdsec/templates/"
+        fi
+    done
+fi

docker/rootfs/etc/s6-overlay/s6-rc.d/cs-crowdsec-bouncer/type

@@ -0,0 +1 @@
+oneshot

docker/rootfs/etc/s6-overlay/s6-rc.d/cs-crowdsec-bouncer/up

@@ -0,0 +1,2 @@
+# shellcheck shell=bash
+/etc/s6-overlay/s6-rc.d/cs-crowdsec-bouncer/script.sh

docs/yarn.lock

@@ -1065,9 +1065,9 @@ vfile@^6.0.0:
     vfile-message "^4.0.0"
 
 vite@^5.4.8:
-  version "5.4.8"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.8.tgz#af548ce1c211b2785478d3ba3e8da51e39a287e8"
-  integrity sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==
+  version "5.4.14"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408"
+  integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"

global/certbot-dns-plugins.json

@@ -215,6 +215,14 @@
 		"credentials": "# Gandi personal access token\ndns_gandi_token=PERSONAL_ACCESS_TOKEN",
 		"full_plugin_name": "dns-gandi"
 	},
+	"gcore": {
+		"name": "Gcore DNS",
+		"package_name": "certbot-dns-gcore",
+		"version": "~=0.1.8",
+		"dependencies": "",
+		"credentials": "dns_gcore_apitoken = 0123456789abcdef0123456789abcdef01234567",
+		"full_plugin_name": "dns-gcore"
+	},
 	"godaddy": {
 		"name": "GoDaddy",
 		"package_name": "certbot-dns-godaddy",