From a4de9872f74e34400ee056b526874f3aa946eab9 Mon Sep 17 00:00:00 2001 From: Swordsteel Date: Fri, 7 Feb 2025 17:50:43 +0100 Subject: [PATCH] =?UTF-8?q?Hl=C3=A6ja=20concept=20v0.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++++++- doc/dependency.md | 32 ++++++++++++++++++-------------- doc/docker_database.md | 2 +- doc/docker_hlaeja.md | 18 +++++++++++++++++- hlaeja-compose.yml | 16 +++++++++++++++- 5 files changed, 60 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 75880ab..5470647 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,14 @@ Plugin containing gradle task and setting used by common, library, and service r Library containing all internal messages for services. GitHub [Hlæja Common Messages](https://github.com/swordsteel/hlaeja-common-messages) -#### Common JWT +#### JWT Library containing JWT for services. GitHub [Hlæja JWT](https://github.com/swordsteel/hlaeja-jwt) +#### Test + +Library containing test assertion extension and test container annotation. GitHub [Hlæja Test](https://github.com/swordsteel/hlaeja-test) + ### Services #### Device Data @@ -65,3 +69,7 @@ API for register devices when flashed. GitHub [Hlæja Registry API](https://gith #### Account Registry Store Information of accounts. GitHub [Hlæja Account Registry](https://github.com/swordsteel/hlaeja-account-registry) + +#### Management + +Management ui. GitHub [Hlæja Account Registry](https://github.com/swordsteel/hlaeja-management) diff --git a/doc/dependency.md b/doc/dependency.md index 5d5400f..dff7607 100644 --- a/doc/dependency.md +++ b/doc/dependency.md @@ -29,14 +29,14 @@ graph TD HMS[Service] end + HM --> HAR + HM -.-> HDR + HM -.-> HDC HDA --> HDR HDA --> HDC HDA --> HDD - HRA --> HDR HRA --> HAR - HM -.-> HDC - HM -.-> HDR - HM -.-> HAR + HRA --> HDR ``` ## Library and Gradle plugin dependency @@ -72,14 +72,17 @@ graph RL CML[Common Messages Library] PL --> CML - JWT[JWT Library] - PL --> JWT + JL[JWT Library] + PL --> JL + + TL[Test Library] + PL --> TL DRS[Device Registry Service] PS --> DRS PCe --> DRS CML --> DRS - JWT --> DRS + JL --> DRS DDS[Device Data Service] PS --> DDS @@ -91,26 +94,27 @@ graph RL DAS[Device API Service] CML --> DAS - JWT --> DAS + JL --> DAS PS --> DAS PCe --> DAS RAS[Registry API Service] CML --> RAS - JWT --> RAS + JL --> RAS PS --> RAS PCe --> RAS AS[Account Service] CML --> AS - JWT --> AS + JL --> AS + TL --> AS PS --> AS PCe --> AS MUS[Management UI Service] - CML -.-> MUS - JWT -.-> MUS - PS -.-> MUS + CML --> MUS + JL --> MUS + PS --> MUS PCe -.-> MUS - + ``` diff --git a/doc/docker_database.md b/doc/docker_database.md index 59ec1d6..09fdd83 100644 --- a/doc/docker_database.md +++ b/doc/docker_database.md @@ -23,7 +23,7 @@ PostgreSQL is a powerful, open-source relational database management system (RDB ```text POSTGRES_USER: postgres -POSTGRES_PASSWORD : password +POSTGRES_PASSWORD: password ``` ## Apache Cassandra diff --git a/doc/docker_hlaeja.md b/doc/docker_hlaeja.md index f348cdc..8cc1284 100644 --- a/doc/docker_hlaeja.md +++ b/doc/docker_hlaeja.md @@ -77,7 +77,6 @@ volumes: - ./cert/registry_api_keystore.p12:/app/resources/cert/keystore.p12 ``` - ## Account Registry ### Environment @@ -98,3 +97,20 @@ Mount a local private key into the container. Read [`rsa_key.md`](./rsa_key.md) volumes: - ./cert/account_private_key.pem:/app/resources/cert/private_key.pem ``` + +## Management + +### Environment + +```text +SPRING_PROFILES_ACTIVE: docker +``` + +### Volume + +Mount a local public key into the container. Read [rsa_key.md](./rsa_key.md) for how to generate. + +```text +volumes: + - ./cert/account_public_key.pem:/app/resources/cert/public_key.pem +``` diff --git a/hlaeja-compose.yml b/hlaeja-compose.yml index cdec3d3..4ed084b 100644 --- a/hlaeja-compose.yml +++ b/hlaeja-compose.yml @@ -77,7 +77,7 @@ services: - ./cert/account_public_key.pem:/app/resources/cert/public_key.pem account-registry: - image: hlaeja-account-registry:0.1.0 + image: hlaeja-account-registry:0.2.0 container_name: AccountRegistry restart: unless-stopped environment: @@ -89,3 +89,17 @@ services: # mount a local `account_private_key.pem` into the container. volumes: - ./cert/account_private_key.pem:/app/resources/cert/private_key.pem + + management: + image: hlaeja-management:0.1.0 + container_name: Management + restart: unless-stopped + environment: + SPRING_PROFILES_ACTIVE: docker + networks: + - develop + ports: + - 9060:8080 + # mount a local `account_public_key.pem` into the container. + volumes: + - ./cert/account_public_key.pem:/app/resources/cert/public_key.pem