diff --git a/.gitignore b/.gitignore index de9d177..81b810c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ .idea/ -keys/ +cert/ diff --git a/IDENTITY.md b/IDENTITY.md index 91752ac..21d5556 100644 --- a/IDENTITY.md +++ b/IDENTITY.md @@ -3,13 +3,13 @@ OpenSSL Project is dedicated to providing a simple installation of OpenSSL for Microsoft Windows. [Download](https://slproweb.com/products/Win32OpenSSL.html) -Generate an RSA private key, of size 2048, and output it to a file named `identity_private_key.pem` in to `./keys` +Generate an RSA private key, of size 2048, and output it to a file named `identity_private_key.pem` in to `./cert` ```shell openssl genrsa -out identity_private_key.pem 2048 ``` -Extract the public key from `identity_private_key.pem` from `./keys`, and output it to a file named `identity_public_key.pem` in to `./keys` +Extract the public key from `identity_private_key.pem` from `./cert`, and output it to a file named `identity_public_key.pem` in to `./cert` ```shell openssl rsa -in identity_private_key.pem -pubout -out identity_public_key.pem diff --git a/README.md b/README.md index 8397a8d..b80e2b5 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Store device information. GitHub [Hlæja Device Data](https://github.com/swordst SPRING_R2DBC_URL: r2dbc:postgresql://localhost:5432/device_registry SPRING_R2DBC_USERBAME: services SPRING_R2DBC_PASSWORD: password -JWT_PRIVATE_KEY: keys/private_key.pem +JWT_PRIVATE_KEY: cert/private_key.pem ``` #### Volume @@ -54,7 +54,7 @@ This will allow you to mount a local private key `identity_private_key.pem` into ```text volumes: - - ./keys/identity_private_key.pem:/app/resources/keys/private_key.pem + - ./cert/identity_private_key.pem:/app/resources/cert/private_key.pem ``` ### Device API diff --git a/compose.yml b/compose.yml index e5624f5..d9b33c5 100644 --- a/compose.yml +++ b/compose.yml @@ -13,7 +13,7 @@ volumes: services: device-data: - image: hlaeja-device-data:0.1.0 + image: hlaeja-device-data:0.1.1 container_name: DeviceData restart: unless-stopped environment: @@ -34,9 +34,9 @@ services: - develop ports: - "9010:8080" -# # mount a local `identity_private_key.pem` into the container. -# volumes: -# - ./keys/identity_private_key.pem:/app/resources/keys/private_key.pem + # mount a local `identity_private_key.pem` into the container. + volumes: + - ./cert/identity_private_key.pem:/app/resources/cert/private_key.pem device-api: image: hlaeja-device-api:0.2.0 @@ -48,10 +48,10 @@ services: - develop ports: - "9000:8443" -# # mount a local `identity_public_key.pem` into the container. -# volumes: -# - ./keys/identity_public_key.pem:/app/resources/cert/public_key.pem -# - ./keys/device_api_keystore.p12:/app/resources/cert/keystore.p12 + # mount a local `identity_public_key.pem` into the container. + volumes: + - ./cert/identity_public_key.pem:/app/resources/cert/public_key.pem + - ./cert/device_api_keystore.p12:/app/resources/cert/keystore.p12 device-configuration: image: hlaeja-device-configuration:0.1.0