Merge branch 'master' into fix-proxy-dev

.gitmodules

@@ -30,3 +30,7 @@
 	path = openslides-icc-service
 	url = https://github.com/OpenSlides/openslides-icc-service.git
 	branch = main
+[submodule "openslides-vote-service"]
+	path = openslides-vote-service
+	url = https://github.com/OpenSlides/openslides-vote-service.git
+	branch = main

Makefile

@@ -34,6 +34,11 @@ services-to-master:
 	# [1] ...or main, or whatever branch the OS4 one is. See .gitmodules.
 	git submodule foreach -q --recursive 'git checkout $(git config -f $$toplevel/.gitmodules submodule.$$name.branch || echo master); git pull upstream $$(git config -f $$toplevel/.gitmodules submodule.$$name.branch || echo master)'
 
+submodules-origin-to-upstream:
+	# You may only use this one time after cloning this repository.
+	# Will set the upstream remote to "origin"
+	git submodule foreach -q --recursive 'git remote rename origin upstream'
+
 cypress-open:
 	cd integration; npm run cypress:open
 

docker/build.sh

@@ -14,6 +14,7 @@ TARGETS=(
   [datastore-reader]="$HOME/../openslides-datastore-service/reader"
   [datastore-writer]="$HOME/../openslides-datastore-service/writer"
   [media]="$HOME/../openslides-media-service/"
+  [vote]="$HOME/../openslides-vote-service/"
   #[pgbouncer]="https://github.com/OpenSlides/openslides-docker-compose.git#:pgbouncer"
   #[postfix]="https://github.com/OpenSlides/openslides-docker-compose.git#:postfix"
   #[repmgr]="https://github.com/OpenSlides/openslides-docker-compose.git#:repmgr"

docker/docker-compose.dev.yml

@@ -151,3 +151,27 @@ services:
       driver: "none" # disable saving logs
     ports:
       - "8025:8025" # web ui to check mails manually
+
+  vote:
+    image: openslides-vote-dev
+    depends_on:
+      - auth
+      - message-bus
+      - datastore-reader
+      - postgres
+    environment:
+      - OPENSLIDES_DEVELOPMENT=true
+      - VOTE_HOST=vote
+      - VOTE_PORT=9013
+      - DATASTORE_READER_HOST=datastore-reader
+      - MESSAGING=redis
+      - MESSAGE_BUS_HOST=message-bus
+      - VOTE_REDIS_HOST=cache
+      - VOTE_DATABASE_HOST=postgres
+      - VOTE_DATABASE_USER=openslides
+      - VOTE_DATABASE_PASSWORD=openslides
+      - VOTE_DATABASE_NAME=openslides
+      - AUTH=ticket
+      - AUTH_HOST=auth
+    ports:
+      - "9013:9013"

docker/services.env

@@ -32,3 +32,11 @@ MEDIA_DATABASE_NAME=openslides
 
 MANAGE_HOST=manage
 MANAGE_PORT=9008
+
+VOTE_HOST=vote
+VOTE_PORT=9013
+VOTE_REDIS_HOST=cache
+VOTE_DATABASE_HOST=postgres
+VOTE_DATABASE_USER=openslides
+VOTE_DATABASE_PASSWORD=openslides
+VOTE_DATABASE_NAME=openslides

openslides-autoupdate-service

@@ -1 +1 @@
-Subproject commit b4e2222a9c68e7e954e37eab262ed77669086585
+Subproject commit b9c287c7c2697cafe2f648e7438c9953c6001111

openslides-backend

@@ -1 +1 @@
-Subproject commit 98055f773558121a11f5e0a5cd358fe8dc4a69c4
+Subproject commit e1f83b6807027ffac64134ee30740b8b4558443e

openslides-client

@@ -1 +1 @@
-Subproject commit b9aa7037fbc723a65674a636c665c69a9966c0d4
+Subproject commit d28b41b7737f0e7a2f90dd9fae511f82c808b24e

openslides-datastore-service

@@ -1 +1 @@
-Subproject commit b71dcc30b9696606da4cf9ff9e4e446bb5251ec3
+Subproject commit ba874ee191ada0d0287437a038f390fbf22a5d80

openslides-icc-service

@@ -1 +1 @@
-Subproject commit af457125e7d0276de7361f197a3d97732dabebd7
+Subproject commit 9f9362e517a012e40b738d5a5c4f3ada36449879

openslides-manage-service

@@ -1 +1 @@
-Subproject commit 30157498c40d994996c1b5bd19ef0701b45b9ad2
+Subproject commit 278ce452358643bafa3c341ddf8ade688cbf5579

openslides-media-service

@@ -1 +1 @@
-Subproject commit 08c1d557b37386ed9168b8ca73e2bb351db4234e
+Subproject commit 27e2f3e1064a14bd13311731f5fbda0bd4e9a706

openslides-vote-service

@@ -0,0 +1 @@
+Subproject commit 955f08da0ababd821f5b0ee138b1c463e0eac924

proxy/caddy_base.json

@@ -21,9 +21,7 @@
     "http": {
       "servers": {
         "srv0": {
-          "listen": [
+          "listen": [":8000"],
-            ":8000"
-          ],
           "allow_h2c": true,
           "routes": [
             {
@@ -40,9 +38,7 @@
               ],
               "match": [
                 {
-                  "path": [
+                  "path": ["/system/autoupdate*"]
-                    "/system/autoupdate*"
-                  ]
                 }
               ]
             },
@@ -59,9 +55,7 @@
               ],
               "match": [
                 {
-                  "path": [
+                  "path": ["/system/presenter*"]
-                    "/system/presenter*"
-                  ]
                 }
               ]
             },
@@ -78,9 +72,7 @@
               ],
               "match": [
                 {
-                  "path": [
+                  "path": ["/system/action*"]
-                    "/system/action*"
-                  ]
                 }
               ]
             },
@@ -97,9 +89,7 @@
               ],
               "match": [
                 {
-                  "path": [
+                  "path": ["/system/media*"]
-                    "/system/media*"
-                  ]
                 }
               ]
             },
@@ -116,9 +106,7 @@
               ],
               "match": [
                 {
-                  "path": [
+                  "path": ["/system/auth*"]
-                    "/system/auth*"
-                  ]
                 }
               ]
             },
@@ -136,9 +124,7 @@
               ],
               "match": [
                 {
-                  "path": [
+                  "path": ["/system/icc*"]
-                    "/system/icc*"
-                  ]
                 }
               ]
             },
@@ -149,10 +135,7 @@
                   "flush_interval": -1,
                   "transport": {
                     "protocol": "http",
-                    "versions": [
+                    "versions": ["2", "h2c"]
-                      "2",
-                      "h2c"
-                    ]
                   },
                   "upstreams": [
                     {
@@ -164,10 +147,25 @@
               "match": [
                 {
                   "header": {
-                    "Content-Type": [
+                    "Content-Type": ["application/grpc"]
-                      "application/grpc"
+                  }
+                }
+              ]
+            },
+            {
+              "handle": [
+                {
+                  "handler": "reverse_proxy",
+                  "upstreams": [
+                    {
+                      "dial": "$VOTE_HOST:$VOTE_PORT"
+                    }
                   ]
                 }
+              ],
+              "match": [
+                {
+                  "path": ["/system/vote*"]
                 }
               ]
             },

proxy/entrypoint

@@ -17,6 +17,7 @@ AUTH_HOST="${AUTH_HOST:-auth}" AUTH_PORT="${AUTH_PORT:-9004}" \
 MEDIA_HOST="${MEDIA_HOST:-media}" MEDIA_PORT="${MEDIA_PORT:-9006}" \
 MANAGE_HOST="${MANAGE_HOST:-manage}" MANAGE_PORT="${MANAGE_PORT:-9008}" \
 CLIENT_HOST="${CLIENT_HOST:-client}" CLIENT_PORT="${CLIENT_PORT:-9001}" \
+VOTE_HOST="${VOTE_HOST:-vote}" VOTE_PORT="${VOTE_PORT:-9013}" \
 envsubst < "$config" > "$config.out" && mv -f "$config.out" "$config"
 
 jq_write() {