From bc98cf12f9b37087299de414eec4defbd7a5ea99 Mon Sep 17 00:00:00 2001
From: Laurent Deketelaere <laurent.deketelaere@redpencil.io>
Date: Fri, 28 Jun 2024 20:28:47 +0200
Subject: [PATCH] chore: bump kalliope-api to 2.0.0

---
 .gitignore                        |  6 ++++--
 config/kalliope/bulk/.gitkeep     |  0
 config/kalliope/security-dev.json |  6 ++++++
 config/kalliope/security-dev.yml  |  9 ---------
 docker-compose.dev.yml            |  2 +-
 docker-compose.yml                | 12 +++++-------
 6 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 config/kalliope/bulk/.gitkeep
 create mode 100644 config/kalliope/security-dev.json
 delete mode 100644 config/kalliope/security-dev.yml

diff --git a/.gitignore b/.gitignore
index 894c430..2ec899d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,9 +29,11 @@ DS_STORE
 /config/proxy-https/cert.pem
 /config/proxy-https/key.pem
 
+# Kalliope config files
 source.json
-out.json
-security.yml
+output.json
+security.json
+
 config/proxy-https/proxy_ssl.conf
 /config/search/update-handler.store
 /config/search/dev/update-handler.store
diff --git a/config/kalliope/bulk/.gitkeep b/config/kalliope/bulk/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/config/kalliope/security-dev.json b/config/kalliope/security-dev.json
new file mode 100644
index 0000000..a70ff6f
--- /dev/null
+++ b/config/kalliope/security-dev.json
@@ -0,0 +1,6 @@
+{
+  "enabled": false,
+  "allowedIpAddresses": [],
+  "authSource": "/config/source.json",
+  "authOutput": "/config/output.json"
+}
\ No newline at end of file
diff --git a/config/kalliope/security-dev.yml b/config/kalliope/security-dev.yml
deleted file mode 100644
index 80aa4b7..0000000
--- a/config/kalliope/security-dev.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# disabled on dev
-application:
-  security:
-    enabled: false
-spring:
-  autoconfigure:
-    exclude:
-       - org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
-       - org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 90aaec1..3a59abd 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -25,7 +25,7 @@ services:
     restart: "no"
   kalliope-api:
     environment:
-      SPRING_SECURITY_CONFIG: "/config/security-dev.yml"
+      SECURITY_CONFIG_PATH: "/config/security-dev.json"
     restart: "no"
   deltanotifier:
     restart: "no"
diff --git a/docker-compose.yml b/docker-compose.yml
index 210a48d..96f28e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -92,18 +92,16 @@ services:
     restart: always
     logging: *default-logging
   kalliope-api:
-    image: lblod/jsonld-delta-service:0.5.6
+    image: lblod/jsonld-delta-service:2.0.0
+    environment:
+      LOG_SPARQL_ALL: "false"
+      SECURITY_CONFIG_PATH: "/config/security.json"
+      DUMP_SUBJECT: "http://data.lblod.info/datasets/delta-producer/dumps/OrganizationsCacheGraphDump"
     volumes:
       - ./config/kalliope:/config
       - ./data/files:/share
     links:
       - db:database
-    environment:
-      SERVER_PORT: "80"
-      LOGGING_LEVEL: "INFO"
-      SPARQL_ENDPOINT: "http://db:8890/sparql"
-      LIMIT_SIZE: "10000"
-      MU_AUTH_SUDO: "true"
     labels:
       - "logging=true"
     restart: always