website

.github/workflows/deploy.yaml

@@ -8,12 +8,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 21
+
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '21'
 
+      - name: Set up node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Angular build
+        run: npm run --prefix website build-production
+
       - name: Generate Javadoc
         run: mvn javadoc:aggregate
 

docker-compose.yml

@@ -175,6 +175,29 @@ services:
           cpus: '0.20'
           memory: 250M
 
+  website-service:
+    image: 70131370/website-service
+    env_file:
+      - .env
+      - .env.override
+    restart: always
+    depends_on:
+      - registry-service
+    environment:
+      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
+
 #  Matomo
 # https://medium.com/@davquar/matomo-lets-install-it-with-docker-512211705c76
 # https://github.com/matomo-org/docker

gateway-service/src/main/kotlin/com/michibaum/gatewayservice/AuthorizationPreFilter.kt

@@ -17,7 +17,6 @@ class AuthorizationPreFilter() : GatewayFilter {
     }
 
     override fun filter(exchange: ServerWebExchange?, chain: GatewayFilterChain?): Mono<Void> {
-//        ServerWebExchangeUtils.
         exchange?.let {
              permissions.get(0).toPermissionString()
         }

gateway-service/src/main/kotlin/com/michibaum/gatewayservice/RoutesConfiguration.kt

@@ -16,33 +16,33 @@ class RoutesConfiguration {
         return builder.routes {
             route {
                 host("admin.michibaum.ch")
-//                filters { AuthorizationPreFilter(Permissions.Admin_Service.CAN_SEND_REQUEST) }
+                filters { AuthorizationPreFilter(Permissions.Admin_Service.CAN_SEND_REQUEST) }
                 uri("lb://admin-service")
             }
             route {
                 host("authentication.michibaum.ch")
-//                filters {}
+                filters {}
                 uri("lb://authentication-service")
             }
             route {
                 host("javadoc.michibaum.ch")
-//                filters { AuthorizationPreFilter(Permissions.JavaDoc_Service.CAN_READ) }
+                filters { AuthorizationPreFilter(Permissions.JavaDoc_Service.CAN_READ) }
                 uri("lb://javadoc-service")
             }
             route {
                 host("registry.michibaum.ch")
-//                filters { AuthorizationPreFilter() }
+                filters { AuthorizationPreFilter() }
                 uri("lb://registry-service")
             }
             route {
                 host("usermanagement.michibaum.ch")
-//                filters { AuthorizationPreFilter() }
+                filters { AuthorizationPreFilter() }
                 uri("lb://usermanagement-service")
             }
             route {
-                host("google.michibaum.ch")
-//                filters { AuthorizationPreFilter() }
-                uri("https://www.google.ch/")
+                host("michibaum.ch")
+                filters { AuthorizationPreFilter() }
+                uri("lb://website-service")
             }
         }
     }

javadoc-service/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
   lifecycle:
     timeout-per-shutdown-phase: 20s
   application:
-    name: javadoc-service
+    name: website-service
   cloud:
     discovery:
       client:

website-service/.gitignore

@@ -0,0 +1,33 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+src/main/resources/angular
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

website-service/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

website-service/README.md

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