From b504a1c51e0f5bee0f3bdc6f34cc5f01f03ec83b Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Wed, 15 Sep 2021 16:14:55 +0200
Subject: [PATCH] Remove permission service

---
 .github/workflows/build_images.yml |  3 ---
 .gitmodules                        |  5 +----
 docker/build.sh                    |  1 -
 docker/docker-compose.dev.yml      | 13 -------------
 openslides-permission-service      |  1 -
 5 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 160000 openslides-permission-service

diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
index 711dec803..35e224880 100644
--- a/.github/workflows/build_images.yml
+++ b/.github/workflows/build_images.yml
@@ -47,9 +47,6 @@ jobs:
           - name: openslides-manage
             directory: openslides-manage-service
 
-          - name: openslides-permission
-            directory: openslides-permission-service
-
     steps:
       - name: Check out code
         uses: actions/checkout@v2
diff --git a/.gitmodules b/.gitmodules
index 66f6cc73a..ee68e6aee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,7 @@
 [submodule "openslides-autoupdate-service"]
 	path = openslides-autoupdate-service
 	url = https://github.com/OpenSlides/openslides-autoupdate-service.git
+	branch = main
 [submodule "openslides-auth-service"]
 	path = openslides-auth-service
 	url = https://github.com/OpenSlides/openslides-auth-service.git
@@ -21,10 +22,6 @@
 	path = openslides-media-service
 	url = https://github.com/OpenSlides/openslides-media-service.git
 	branch = openslides4-dev
-[submodule "openslides-permission-service"]
-	path = openslides-permission-service
-	url = https://github.com/OpenSlides/openslides-permission-service.git
-	branch = master
 [submodule "openslides-manage-service"]
 	path = openslides-manage-service
 	url = https://github.com/OpenSlides/openslides-manage-service.git
diff --git a/docker/build.sh b/docker/build.sh
index 158ce695e..79d752bc6 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -10,7 +10,6 @@ TARGETS=(
   [backend]="$HOME/../openslides-backend/"
   [auth]="$HOME/../openslides-auth-service/"
   [autoupdate]="$HOME/../openslides-autoupdate-service/"
-  [permission]="$HOME/../openslides-permission-service/"
   [manage]="$HOME/../openslides-manage-service/"
   [datastore-reader]="$HOME/../openslides-datastore-service/reader"
   [datastore-writer]="$HOME/../openslides-datastore-service/writer"
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 8d61089f0..739b30a28 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -55,7 +55,6 @@ services:
       - datastore-reader
       - datastore-writer
       - auth
-      - permission
     env_file: services.env
     environment:
       - OPENSLIDES_DEVELOPMENT=1
@@ -89,18 +88,6 @@ services:
       - ../openslides-icc-service/cmd:/root/cmd
       - ../openslides-icc-service/internal:/root/internal
 
-  permission:
-    image: openslides-permission-dev
-    depends_on:
-      - datastore-reader
-    env_file: services.env
-    environment:
-      - OPENSLIDES_DEVELOPMENT=1
-    volumes:
-      - ../openslides-permission-service/cmd:/app/cmd
-      - ../openslides-permission-service/internal:/app/internal
-      - ../openslides-permission-service/pkg:/app/pkg
-
   auth:
     image: openslides-auth-dev
     depends_on:
diff --git a/openslides-permission-service b/openslides-permission-service
deleted file mode 160000
index 4b058fe85..000000000
--- a/openslides-permission-service
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4b058fe85f7261e43e192993958bc31bdea541d6