Reconfigure aidbox

beda-software · Mar 18, 2024 · f31a330 · f31a330
1 parent b4c505c
commit f31a330
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 54 deletions.
diff --git a/env/aidbox b/env/aidbox
@@ -1,5 +1,5 @@
 AIDBOX_DEV_MODE=true
-AIDBOX_ZEN_ENTRYPOINT=system/box
+AIDBOX_ZEN_ENTRYPOINT=main/box
 BOX_PROJECT_GIT_TARGET__PATH=/zenproject
 AIDBOX_ZEN_PROJECT=/zenproject
 AIDBOX_CORRECT_AIDBOX_FORMAT=true
@@ -18,9 +18,11 @@ PGPORT=5432
 PGUSER=postgres
 PGPASSWORD=postgres
 
-OPENID_RSA=/var/config/jwtRS256.key
-OPENID_RSA_PUB=/var/config/jwtRS256.key.pub
+BOX_METRICS_PORT=8766
+BOX_AUTH_KEYS_SECRET=auth-key-secret
+BOX_AUTH_KEYS_PRIVATE="-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEApbUYGNmCz1P8G0j/FFOjx1d5GNssJ/jj6xasSwTIbjjt6FtY\nCDw8o7hayOc/u8aUqXCGhK3JD2T9gtKv9/rV30w4YzmHhA8OOuLJE7tfh/PJA4Hn\n4i2JJ30BuoZ7rPTlTRGdc1FS3XFdmBQtnplEkJ7y8qbdrVme3Kbtn+BR1BdtgwSy\nbpNH2yqh3bb6PwpgNSMH7BIkBWL4A6QDpaFf1/9jSNE1vO25ssLC+bhFQNWLYriu\n+HogzEf9NWIrR2W29mI1QiA7wqvEuhg1yx38ylWD8GhCGL6+2QLKBYgp7DIGv6Uo\nTnqcVISatdQ51lVcCPmU6L1BhmcXVti6dWBI+wIDAQABAoIBAFKMOcJbTKpKvLq8\n7PErz1lFDpreyArrlmKsy0ydx9j8vCt1oY+MrmqisnsFk/7PaIxV9XUP+6qTFSUA\nHtAKYVOZLTfk10jmlSCpjCCrxWW9AISiSKkoJPyKbfuE9gRNhRMU9NoXB5Av4r+Z\nQbaRxJHE1OMjVCgAjr592786qJjd+shhY8ZLchrxctpBj6/4T2Rd4Q8ltyEV3hiy\noYaFVp9g332bFw7jZSuxgedZojNO6xPvbparTAgVDDwKB+CVUhuZ5EXWwemRvwoc\nYZM1UKPgtCqBZwm2GRv7s6XzJKBAZEMxcL7hS0RfijCe4MJcZlUCoM43Tf5XqDlT\nMmoXnPECgYEA4dkY/uqDLjJep5+4imRbceotxV2CZoJRQ0D85Ewu3tm9zdXhqL4p\n3XAOcNnqj7xBP3qkb/cXZumwdAIZns4kO1kw5hVQLX+xwMAJuravxp8sYJkx3CLO\noaOPNnlhGRv35fg4ZnoHHMO2C0wUmtSqsi6vE1EObYsIIFil58pI0NECgYEAu9SL\ne6AUCI/sdDlrTXQ8fdW8XSSJYPhZHqAvOAZfkeG4uuA2Qzxe8yUSES7z5V29futl\nWU7x+FWfqzkjh8qerviydAEFxVOpZ99ih9VB9dAwz3nX3OCoz3EUFmQGtTMxQmbo\nfW9sT4E6R7Hpa5jKnYvixk6u4p3aoEaZI4KeUAsCgYEA2OC3hiQBcN1h1Com9o7E\n2bF93qebT4EZNDI2J62Y3NvPztfy6S4j2cd/tpMtEnY/WgwV2Ic5a9RBZEWYAM4I\nMQ3HTUtuQSL8uRIwxaIlTeEQpnq2TKUINGRyZGdO/OPEvIwO7SmFpvOx30tiBgTv\nHkiCS1RtPHhkh1tZhirUneECgYAxNmARVQDKuYLXdM/jbEgJJD4FHXSNHqSi/I9C\nm5DgtQZkmCg/d4rdI+JW9Dlc6DGlFmHog2GskiqSfxcLFhB7gZeoAziS2fexynqT\nYlG06QZQ5fij24z/RP5hW3XSdgY7AqF5c/8p2Y7+h+PDmDXGD4esM6NoprlIcxbe\nkfOOvwKBgQCoOpkW+OWnxPLawmG/gv8+s5CsfOPUpURwAjltSXz9LXvsJmWQPQVG\np4sKEOJidYyt24YrIHi9/UEqRi+uuRQ4zCuXS6UjXftjAarPIPGkL/1S6B1Z91zg\nE5C0rXOvAlrvK09p4HGXLrwQxjrWt8R7rPvaD2yqVKLP4liFj8RMdg==\n-----END RSA PRIVATE KEY-----\n"
+BOX_AUTH_KEYS_PUBLIC="-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApbUYGNmCz1P8G0j/FFOj\nx1d5GNssJ/jj6xasSwTIbjjt6FtYCDw8o7hayOc/u8aUqXCGhK3JD2T9gtKv9/rV\n30w4YzmHhA8OOuLJE7tfh/PJA4Hn4i2JJ30BuoZ7rPTlTRGdc1FS3XFdmBQtnplE\nkJ7y8qbdrVme3Kbtn+BR1BdtgwSybpNH2yqh3bb6PwpgNSMH7BIkBWL4A6QDpaFf\n1/9jSNE1vO25ssLC+bhFQNWLYriu+HogzEf9NWIrR2W29mI1QiA7wqvEuhg1yx38\nylWD8GhCGL6+2QLKBYgp7DIGv6UoTnqcVISatdQ51lVcCPmU6L1BhmcXVti6dWBI\n+wIDAQAB\n-----END PUBLIC KEY-----\n"
 
 AIDBOX_STDOUT_PRETTY=all
 
-BOX_FEATURES_FTR_PULL_ENABLE=false
+BOX_FEATURES_FTR_PULL_ENABLE=false
diff --git a/zenproject/zrc/system.edn → zenproject/zrc/config.edn b/zenproject/zrc/system.edn → zenproject/zrc/config.edn
@@ -1,13 +1,7 @@
-{ns system
+{ns     config
  import #{aidbox
-          aidbox.rest
-          aidbox.search-parameter.v1
-          aidbox.repository.v1
-          zen.fhir}
-
- features
- {:zen/tags #{aidbox.config/features}
-  :validation {:mode "fhir-schema"}}
+          aidbox.config
+          hl7-fhir-r4-core}
 
  db-config
  {:zen/tags #{aidbox.config/db}
@@ -52,65 +46,60 @@
          :private #env BOX_AUTH_KEYS_PRIVATE
          :public #env BOX_AUTH_KEYS_PUBLIC}}
 
+ metrics
+ {:zen/tags #{aidbox.config/metrics}
+  :port #env BOX_METRICS_PORT}
+
+ features
+ {:zen/tags #{aidbox.config/features}
+  :validation {:mode "fhir-schema"}}
+
  base-config
  {:zen/tags                #{aidbox.config/config}
-  ;; :web                     web-config
-  ;; :db                      db-config
-  ;; :search                  search-config
-  ;; :compatibility           compatibility-config
-  ;; :auth                    auth
+  :web                     web-config
+  :db                      db-config
+  :search                  search-config
+  :compatibility           compatibility-config
+  :auth                    auth
+  :metrics                 metrics
 
+  :aidbox-license #env AIDBOX_LICENSE
+
+  :fhir-version            "4.0.1"
   :features                features
   :fhir-packages           "hl7.fhir.au.core#0.3.0-ballot"
-  :aidbox-license           #env AIDBOX_LICENSE
-  :fhir-version            "4.0.1"
   :compliant-mode-enabled? true
   :override-createdat-url  "http://fhir.aidbox.app/extension/createdat"
   :correct-aidbox-format   true
   :dev-mode                #env-boolean AIDBOX_DEV_MODE
   :stdout-pretty           true
   :disable-legacy-seed     true}
 
- box
- {:zen/tags #{aidbox/system}
-  :zen/desc "AU Core"
-  :config   base-config
-  :services {:public-access public-access
-             :allow-rpc allow-rpc
-             :smart-app smart-app
-             :seed seed
-             :auth-config auth-config}}
-
- seed
- {:zen/tags  #{aidbox/service}
-  :engine    aidbox/seed
-  :files ["seeds-data.ndjson.gz"]}
-
- public-access
+ admin-user-seed
  {:zen/tags #{aidbox/service}
   :engine   aidbox/seed-v2
   :resources
-  {:AccessPolicy {:allow-any-user {:engine "allow"}}}}
+  {:User {:admin
+          {:password #env AIDBOX_ADMIN_PASSWORD}}
 
- allow-rpc
+   :AccessPolicy {:allow-admin-user
+                  {:engine "allow"
+                   :link   [{:resourceType "User" :id "admin"}]}}}}
+ root-client-seed
  {:zen/tags #{aidbox/service}
   :engine   aidbox/seed-v2
   :resources
-  {:AccessPolicy {:allow-rpc {:engine "json-schema"
-                              :schema {:uri {:constant "/rpc"}}}}}}
+  {:Client {:root
+            {:name        "Root client"
+             :secret      #env AIDBOX_CLIENT_SECRET
+             :first_party true
+             :grant_types ["basic"]}}
 
- smart-app
- {:zen/tags #{aidbox/service}
-  :engine   aidbox/seed-v2
-  :resources
-  {:Client
-   {:smart-app {:auth {:authorization_code {:redirect_uri "http://localhost:5173/"}}
-                :grant_types [:authorization_code]
-                :smart {:launch_uri "http://localhost:5173/"}}}}}
+   :AccessPolicy {:allow-root-client
+                  {:engine "allow"
+                   :link   [{:resourceType "Client" :id "root"}]}}}}
+ demo-data-seed
+ {:zen/tags  #{aidbox/service}
+  :engine    aidbox/seed
+  :files ["seeds-data.ndjson.gz"]}}
 
- auth-config
- {:zen/tags #{aidbox/service}
-  :engine   aidbox/seed-v2
-  :resources
-  {:AuthConfig
-   {:app {:theme {:styleUrl "/assets/aidbox.css"}}}}}}
diff --git a/zenproject/zrc/main.edn b/zenproject/zrc/main.edn
@@ -0,0 +1,10 @@
+{ns main
+ import #{aidbox
+          config}
+
+ box
+ {:zen/tags #{aidbox/system}
+  :config   config/base-config
+  :services {:admin-user-seed config/admin-user-seed
+             :root-client-seed config/root-client-seed
+             :demo-data-seeds config/demo-data-seed}}}