Merge branch 'master' into resources

config/authorization/delta.ex

@@ -0,0 +1,5 @@
+defmodule Delta.Config do
+  def targets do
+    [ "http://deltanotifier" ]
+  end
+end

config/delta/rules.js

@@ -0,0 +1,16 @@
+export default [
+    {
+      match: {
+        subject: {
+        }
+      },
+      callback: {
+        url: "http://kalliope-api/delta", method: "POST"
+      },
+      options: {
+        resourceFormat: "v0.0.1",
+        gracePeriod: 1000,
+        ignoreFromSelf: true
+      }
+    }
+  ]

config/dispatcher/dispatcher.ex

@@ -8,7 +8,7 @@ defmodule Dispatcher do
     any: [ "*/*" ],
   ]
 
-  define_layers [ :api, :frontend, :not_found ]
+  define_layers [ :api_services, :api, :frontend, :not_found ]
 
   ###############################################################
   # domain.json
@@ -136,6 +136,30 @@ defmodule Dispatcher do
     forward conn, path, "http://db:8890/sparql/"
   end
 
+  ###############
+  # API SERVICES
+  ###############
+  match "/v3/api-docs/*path", %{ layer: :api_services, accept: %{ json: true } } do
+    forward conn, path, "http://kalliope-api/v3/api-docs/"
+  end
+
+  match "/delta/*path", %{ layer: :api_services, accept: %{ json: true } } do
+    forward conn, path, "http://kalliope-api/delta/"
+  end
+
+  match "/bulk/*path", %{ layer: :api_services, accept: %{ json: true } } do
+    forward conn, path, "http://kalliope-api/bulk"
+  end
+
+  match "/changes/*path", %{ layer: :api_services, accept: %{ json: true } } do
+    forward conn, path, "http://kalliope-api/changes/"
+  end
+
+  match "/consolidated/*path", %{ layer: :api_services, accept: %{ json: true } } do
+    forward conn, path, "http://kalliope-api/consolidated/"
+  end
+
+
   ###############################################################
   # ember metis
   ###############################################################

config/proxy/nginx.htpasswd

@@ -1,2 +1,3 @@
 root:$apr1$x9yMUyVV$w2FZk76C0mbKOlDHdLDV30
-contacthub:$apr1$X8vLzV8z$Xsb.0lLoyasxfvwxQGQUp/
+contacthub:$apr1$X8vLzV8z$Xsb.0lLoyasxfvwxQGQUp/
+kalliope:$apr1$1HrKMwbi$Uqc18XpIohhrabnM49ete1

docker-compose.yml

@@ -12,7 +12,7 @@ services:
     image: semtech/mu-identifier:1.9.1
     environment:
       DEFAULT_ACCESS_CONTROL_ALLOW_ORIGIN_HEADER: "*"
-      DEFAULT_MU_AUTH_ALLOWED_GROUPS_HEADER: "[{\"variables\":[],\"name\":\"public\"}]"
+      DEFAULT_MU_AUTH_ALLOWED_GROUPS_HEADER: "[{\"variables\":[],\"name\":\"public\"}, {\"variables\":[],\"name\":\"clean\"}]"
     labels:
       - "logging=true"
     restart: always
@@ -111,6 +111,20 @@ services:
     logging: *default-logging
     labels:
       - "logging=true"
+  kalliope-api:
+    image: lblod/jsonld-delta-service
+    volumes:
+      - ./config/kalliope:/config
+      - ./data/files:/share
+    environment:
+      SERVER_PORT: "80"
+      LOGGING_LEVEL: "INFO"
+      SPARQL_ENDPOINT: "http://db:8890/sparql"
+    restart: always
+  deltanotifier:
+    image: semtech/mu-delta-notifier:0.1.0
+    volumes:
+      - ./config/delta:/config
   frontend:
     image: lblod/frontend-contact-hub
     labels: