DRAFT: Add OCSP support

.github/workflows/build.yml

@@ -126,6 +126,7 @@ jobs:
         dcloc down -v || true
 
   rmdev:
+    if: false
     runs-on: ubuntu-latest
     permissions:
       contents: write

.gitmodules

@@ -22,3 +22,9 @@
 [submodule "ui"]
 	path = ui
 	url = git@github.com:pvarki/rasenmaeher-ui.git
+[submodule "takserver"]
+	path = takserver
+	url = git@github.com:pvarki/docker-atak-server.git
+[submodule "takintegration"]
+	path = takintegration
+	url = git@github.com:pvarki/python-tak-rmapi.git

README.rst

@@ -35,8 +35,10 @@ Directories that are submodules
   - keycloak https://github.com/pvarki/docker-keycloak
   - kw_product_init https://github.com/pvarki/golang-kraftwerk-init-helper-cli
   - openldap https://github.com/pvarki/docker-openldap
-  - miniwerk https://github.com/pvarki/ https://github.com/pvarki/python-rasenmaeher-miniwerk
+  - miniwerk https://github.com/pvarki/python-rasenmaeher-miniwerk
   - ui https://github.com/pvarki/rasenmaeher-ui
+  - takserver https://github.com/pvarki/docker-atak-server
+  - takintegration https://github.com/pvarki/python-tak-rmapi
 
 
 Running in local development mode

docker-compose-dev.yml

@@ -12,7 +12,7 @@ services:
     volumes:
       - "./api:/app"
 
-  rmui:
+  rmuidev:
     image: pvarki/rmui:devel_shell
     build:
       context: ./ui
@@ -21,12 +21,33 @@ services:
     command: ["-c", "npm install && npm run dev -- --port 8002 --host 0.0.0.0"]
     volumes:
       - "./ui:/app"
+    environment:
+      SERVER_DOMAIN: ${SERVER_DOMAIN:-localmaeher.pvarki.fi}
+      API_PORT: ${NGINX_HTTPS_PORT:-4439}
+    networks:
+      - intranet
+    ports:  # REMINDER Do not expose these in production
+      - "${NGINX_UI_UPSTREAM_PORT:-8002}:${NGINX_UI_UPSTREAM_PORT:-8002}"
+    healthcheck:
+      test: 'true'  # FIXME
+      interval: 5s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
 
-  rmnginx:  # apparently we have to specify these here or it tries to start too early
+  rmnginx:  # need to load different templates for uidev
     image: nginx
+    environment:
+      NGINX_UI_UPSTREAM: "rmuidev"
+      NGINX_UI_UPSTREAM_PORT: ${NGINX_UI_UPSTREAM_PORT:-8002}
+      NGINX_ENVSUBST_TEMPLATE_DIR: /templates_uidev
+    volumes:
+      - ./nginx/templates_rasenmaeher_uidev:/templates_uidev
     depends_on:
       rmapi:
         condition: service_healthy
+      rmuidev:
+        condition: service_healthy
 
   kwinit_prod:  # For building the go executable needed by rmfpapi
     image: pvarki/kw_product_init:latest
@@ -55,6 +76,29 @@ services:
       rmfpapi:
         condition: service_healthy
 
+
+  takrmapi:
+    image: pvarki/takrmapi:devel_shell
+    build:
+      context: ./takintegration
+      dockerfile: Dockerfile
+      target: integ_devel_shell
+    command: ["-c", "source /root/.profile && /container-init.sh && poetry install && uvicorn --host 0.0.0.0 --port 8003 --log-level debug --factory takrmapi.app:get_app --reload"]
+    environment:
+      LOG_LEVEL: 10
+    volumes:
+      - "./takintegration:/app"
+    depends_on:
+      rmnginx:
+        condition: service_healthy
+
+  taknginx:  # apparently we have to specify these here or it tries to start too early
+    image: nginx
+    depends_on:
+      takrmapi:
+        condition: service_healthy
+
+
   kwinit:  # docker-compose -p rmdev -f docker-compose-local.yml -f docker-compose-dev.yml exec kwinit zsh
     image: pvarki/kw_product_init:devel_shell
     build:
@@ -69,3 +113,8 @@ services:
     depends_on:
       rmapi:
         condition: service_healthy
+    profiles: ["kwinit_dev"]
+
+
+networks:
+  intranet: