Merge pull request #42 from MichiBaum/develop

Develop (Test SSL)

.env

@@ -1,15 +1,16 @@
 SPRING_ACTIVE_PROFILES=prod
+SSL_KEYSTORE_PASSWORD=PleaseChangeMe
 
 DISCORD_BOT_TOKEN=PleaseChangeMe
 DISCORD_GUILD_ID=PleaseChangeMe
 DISCORD_REGISTRY_SERVICE_LOG_CHANNEL=PleaseChangeMe
 DISCORD_USERMANAGEMENT_SERVICE_LOG_CHANNEL=PleaseChangeMe
 DISCORD_WEBSITE_SERVICE_LOG_CHANNEL=PleaseChangeMe
-DISCORD_JAVADOC_SERVICE_LOG_CHANNEL=PleaseChangeMe
 DISCORD_CHESS_SERVICE_LOG_CHANNEL=PleaseChangeMe
 DISCORD_GATEWAY_SERVICE_LOG_CHANNEL=PleaseChangeMe
 DISCORD_AUTHENTICATION_SERVICE_LOG_CHANNEL=PleaseChangeMe
 DISCORD_ADMIN_SERVICE_LOG_CHANNEL=PleaseChangeMe
+DISCORD_FITNESS_SERVICE_LOG_CHANNEL=PleaseChangeMe
 
 USERMANAGEMENT_DB_PASSWORD=PleaseChangeMe
 USERMANAGEMENT_DB=usermanagement
@@ -18,4 +19,7 @@ AUTHENTICATION_DB_PASSWORD=PleaseChangeMe
 AUTHENTICATION_DB=authentication
 
 CHESS_DB_PASSWORD=PleaseChangeMe
-CHESS_DB=chess
+CHESS_DB=chess
+
+FITNESS_DB_PASSWORD=PleaseChangeMe
+FITNESS_DB=fitness

.github/workflows/deploy.yaml

@@ -17,6 +17,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '21'
+          cache: 'maven'
 
       - name: Set up node
         uses: actions/setup-node@v4

.github/workflows/sonarqube.yml

@@ -14,6 +14,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '21'
+          cache: 'maven'
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any

README.md

@@ -21,18 +21,24 @@ There are these microservices:
 - [Admin Service](./admin-service/README.md)
 - [Authentication Service](./authentication-service/README.md)
 - [Gateway Service](./gateway-service/README.md)
-- [Javadoc Service](./javadoc-service/README.md)
 - [Registry Service](./registry-service/README.md)
 - [Usermanagement Service](./usermanagement-service/README.md)
 - [Website Service](./website-service/README.md)
 - [Chess Service](./chess-service/README.md)
+- [Fitness Service](./fitness-service/README.md)
 
-And these libraries
+And these libraries:
 - [Authentication Library](./authentication-library/README.md)
 - [Permission Library](./permission-library/README.md)
 - [Usermanagement Library](./usermanagement-library/README.md)
 - [Spring Boot Starter Discord](./spring-boot-starter-discord/README.md)
 
+And these databases:
+- Authentication DB
+- Usermanagement DB
+- Chess DB
+- Fitness DB
+
 ## Release
 
 ### Maven release plugin
@@ -41,10 +47,6 @@ And these libraries
 
 ## Docker
 
-### Build JavaDoc
-
-    mvnw javadoc:aggregate
-
 ### Container
 
 #### Up
@@ -76,7 +78,6 @@ In *C:\Windows\System32\drivers\etc* find file *hosts* and add those lines:
     127.0.0.1 gateway.michibaum.ch
     127.0.0.1 registry.michibaum.ch
     127.0.0.1 admin.michibaum.ch
-    127.0.0.1 javadoc.michibaum.ch
     127.0.0.1 usermanagement.michibaum.ch
     127.0.0.1 authentication.michibaum.ch
     127.0.0.1 michibaum.ch

admin-service/src/main/resources/application-prod.yml

@@ -1,5 +1,8 @@
 server:
   port: 80
+  ssl:
+    bundle: “web-server”
+    client-auth: WANT
 
 spring:
   microservices:
@@ -14,6 +17,15 @@ spring:
     admin:
       ui:
         public-url: http://admin.michibaum.ch
+  ssl:
+    bundle:
+      jks:
+        web-server:
+          key:
+            alias: "michibaum"
+          keystore:
+            location: "/data/ssl/keystore.p12"
+            password: ${SSL_KEYSTORE_PASSWORD}
 
 eureka:
   client:

authentication-service/src/main/resources/application-prod.yml

@@ -1,5 +1,8 @@
 server:
   port: 80
+  ssl:
+    bundle: “web-server”
+    client-auth: WANT
 
 spring:
   microservices:
@@ -10,6 +13,17 @@ spring:
       logging:
         enabled: true
         channel-id: ${DISCORD_AUTHENTICATION_SERVICE_LOG_CHANNEL}
+  ssl:
+    bundle:
+      jks:
+        web-server:
+          key:
+            alias: "michibaum"
+          keystore:
+            location: "/data/ssl/keystore.p12"
+            password: ${SSL_KEYSTORE_PASSWORD}
+
+
 
 eureka:
   client:

chess-service/src/main/resources/application-prod.yml

@@ -1,5 +1,8 @@
 server:
   port: 80
+  ssl:
+    bundle: “web-server”
+    client-auth: WANT
 
 spring:
   microservices:
@@ -10,6 +13,15 @@ spring:
       logging:
         enabled: true
         channel-id: ${DISCORD_CHESS_SERVICE_LOG_CHANNEL}
+  ssl:
+    bundle:
+      jks:
+        web-server:
+          key:
+            alias: "michibaum"
+          keystore:
+            location: "/data/ssl/keystore.p12"
+            password: ${SSL_KEYSTORE_PASSWORD}
 
 eureka:
   client:

docker-compose.yml

@@ -12,6 +12,8 @@ services:
       spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "8761"
+    volumes:
+      - /data/ssl:/data/ssl
     networks:
       - microservice-network
     deploy:
@@ -35,29 +37,8 @@ services:
       spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "80"
-    networks:
-      - microservice-network
-    deploy:
-      resources:
-        limits:
-          cpus: '0.50'
-          memory: 500M
-        reservations:
-          cpus: '0.20'
-          memory: 250M
-
-  javadoc-service:
-    image: 70131370/javadoc-service
-    env_file:
-      - .env
-      - .env.override
-    restart: always
-    depends_on:
-      - registry-service
-    environment:
-      spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
-    expose:
-      - "80"
+    volumes:
+      - /data/ssl:/data/ssl
     networks:
       - microservice-network
     deploy:
@@ -83,6 +64,8 @@ services:
       DATABASE: ${AUTHENTICATION_DB}
     expose:
       - "80"
+    volumes:
+      - /data/ssl:/data/ssl
     networks:
       - microservice-network
     deploy:
@@ -125,6 +108,8 @@ services:
       DATABASE: ${USERMANAGEMENT_DB}
     expose:
       - "80"
+    volumes:
+      - /data/ssl:/data/ssl
     networks:
       - microservice-network
     deploy:
@@ -164,6 +149,9 @@ services:
       spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     ports:
       - "80:80"
+      - "443:80"
+    volumes:
+      - /data/ssl:/data/ssl
     networks:
       - microservice-network
     deploy:
@@ -187,6 +175,8 @@ services:
       spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
     expose:
       - "80"
+    volumes:
+      - /data/ssl:/data/ssl
     networks:
       - microservice-network
     deploy:
@@ -213,6 +203,8 @@ services:
       DATABASE: ${CHESS_DB}
     expose:
       - "80"
+    volumes:
+      - /data/ssl:/data/ssl
     networks:
       - microservice-network
     deploy:
@@ -240,6 +232,50 @@ services:
     networks:
       - microservice-network
 
+  fitness-service:
+    image: 70131370/fitness-service
+    env_file:
+      - .env
+      - .env.override
+    restart: always
+    depends_on:
+      - registry-service
+      - fitness-db
+    environment:
+      spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
+      DATABASE_PASSWORD: ${FITNESS_DB_PASSWORD}
+      DATABASE: ${FITNESS_DB}
+    expose:
+      - "80"
+    volumes:
+      - /data/ssl:/data/ssl
+    networks:
+      - microservice-network
+    deploy:
+      resources:
+        limits:
+          cpus: '0.50'
+          memory: 500M
+        reservations:
+          cpus: '0.20'
+          memory: 250M
+
+  fitness-db:
+    image: mysql:9.0
+    env_file:
+      - .env
+      - .env.override
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: ${FITNESS_DB_PASSWORD}
+      MYSQL_DATABASE: ${FITNESS_DB}
+    expose:
+      - "3306"
+    volumes:
+      - /data/fitness-db:/var/lib/mysql
+    networks:
+      - microservice-network
+
 #  Matomo
 # https://medium.com/@davquar/matomo-lets-install-it-with-docker-512211705c76
 # https://github.com/matomo-org/docker

fitness-service/README.md

@@ -0,0 +1 @@
+# Fitness Service