Skip to content

Commit a32d394

Browse files
committed
refactor: move ODRL policy into authorisation config folder
1 parent e09fb9b commit a32d394

5 files changed

Lines changed: 6 additions & 17 deletions

File tree

config/authorization/config.lisp

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
(add-delta-messenger "http://deltanotifier/")
88

99

10-
; CONFIGURATION
10+
;; CONFIGURATION
1111

1212
(in-package :client)
1313
(setf *log-sparql-query-roundtrip* t)
@@ -16,18 +16,8 @@
1616
(in-package :server)
1717
(setf *log-incoming-requests-p* t)
1818

19-
; ACCESS RIGHTS
20-
;; The following functionality allows to easily switch between the manually written policy and one
21-
;; generated from an ODRL policy. When updating the app's policy, apply the necessary changes in the
22-
;; `decide.lisp' file.
23-
(defparameter *use-odrl-policy-p*
24-
(and (uiop:getenv "USE_ODRL_POLICY")
25-
(string-equal (uiop:getenv "USE_ODRL_POLICY") "true"))
26-
"Indicate whether to use the configuration generated from ODRL or the rules in this file.")
19+
(in-package :odrl-config)
20+
(setf *use-odrl-config-p* t)
2721

28-
(let ((config-path
29-
(if *use-odrl-policy-p*
30-
"./odrl/decideAuthorizationPolicy.lisp"
31-
"./config/decide.lisp")))
32-
(format t "~& >> Loading policy from file: ~A" config-path)
33-
(load config-path))
22+
;; ACCESS RIGHTS
23+
;; The access policy is defined using ODRL in `./config.nt'.

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ services:
2929
USE_ODRL_POLICY: "false"
3030
volumes:
3131
- ./config/authorization:/config
32-
- ./config/odrl-parser:/odrl
3332
- ./data/authorization:/data
3433
labels:
3534
- "logging=true"

scripts/ttl-to-ntriples/ttl-to-ntriples.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# NOTE (05/09/2025): To further generalise this script, this constant should be
88
# made into a argument that can be passed by the caller.
9-
CONFIG_PATH = "/app/config/odrl-parser/"
9+
CONFIG_PATH = "/app/config/authorization/"
1010
TTL_EXT = ".ttl"
1111
NTRIPLES_EXT = ".nt"
1212

0 commit comments

Comments
 (0)