From 3297e9c4e2aba4dfad7eb604d0361d3566b97225 Mon Sep 17 00:00:00 2001 From: fistutzenste Date: Fri, 31 Jul 2020 09:22:01 +0200 Subject: [PATCH] Remove mkcert, update submodules --- DEVELOPMENT.md | 8 ++------ haproxy/prepare-cert.sh | 6 ++---- openslides-autoupdate-service | 2 +- openslides-backend | 2 +- openslides-client | 2 +- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 602791d8e..aaacd4e52 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -2,7 +2,7 @@ ## Requirements -You need git, bash, docker, docker-compose, make and go installed. +You need git, bash, docker, docker-compose, make and openssl installed. Go is needed to install https://github.com/FiloSottile/mkcert. The development setup uses HTTPS per default. OpenSlides does not work with HTTP anymore since features are required (like http2) that only works in a secure environment. @@ -15,13 +15,9 @@ Clone this repository: TODO: use `--recurse-submodules`, when master is OS4 -After checking out the os4-branch you need to initialize all submodules and install a root-cert: +After checking out the os4-branch you need to initialize all submodules: $ git submodule update --init - $ go get https://github.com/FiloSottile/mkcert - $ sudo mkcert -install - -If you get an error, you might need to install `certutil`. For Debian: `sudo apt install libnss3-tools`. Finally, start the dev server: diff --git a/haproxy/prepare-cert.sh b/haproxy/prepare-cert.sh index 118090482..d3f76d8ec 100755 --- a/haproxy/prepare-cert.sh +++ b/haproxy/prepare-cert.sh @@ -9,10 +9,8 @@ combined="src/combined.pem" if [[ ! -f $combined ]]; then echo "Creating certificates..." cd src - if type 2>1 >/dev/null mkcert ; then - mkcert -cert-file localhost.pem -key-file localhost-key.pem localhost 127.0.0.1 - elif type 2>1 >/dev/null openssl ; then - echo "Command 'mkcert' not found, using openssl fallback." + if type 2>&1 >/dev/null openssl ; then + echo "Using openssl to generate a certificate." echo "You will need to accept an security exception for the" echo "generated certificate in your browser manually." openssl req -x509 -newkey rsa:4096 -nodes -days 3650 \ diff --git a/openslides-autoupdate-service b/openslides-autoupdate-service index ce94d1321..b7a27628c 160000 --- a/openslides-autoupdate-service +++ b/openslides-autoupdate-service @@ -1 +1 @@ -Subproject commit ce94d13217edc72f7d53e94fb93864d183cb53d3 +Subproject commit b7a27628c198db1165a1ebf832b508cc3eb08dd7 diff --git a/openslides-backend b/openslides-backend index d2398df88..b1fbe0ffe 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit d2398df883394140d7e2b1df88a203d58fa00da4 +Subproject commit b1fbe0ffe665bfb609baa4b2ca5d04d3ed6ba241 diff --git a/openslides-client b/openslides-client index 197d55208..626b43dfd 160000 --- a/openslides-client +++ b/openslides-client @@ -1 +1 @@ -Subproject commit 197d552083287d418387556b99a755fa81abb29a +Subproject commit 626b43dfd0adf6c1c958a37e63c9de745b360a0e