ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5490 from FinnStutzenstein/removeMkcert 

Remove mkcert, update submodules
This commit is contained in:
Finn Stutzenstein 2020-07-31 09:23:19 +02:00 committed by GitHub
parent 0671ca66c2 3297e9c4e2
commit 40fde015fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DEVELOPMENT.md
View File

@ -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:

6
haproxy/prepare-cert.sh
View File

@ -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 \

2
openslides-autoupdate-service

@ -1 +1 @@
Subproject commit ce94d13217edc72f7d53e94fb93864d183cb53d3
Subproject commit b7a27628c198db1165a1ebf832b508cc3eb08dd7

2
openslides-backend

@ -1 +1 @@
Subproject commit d2398df883394140d7e2b1df88a203d58fa00da4
Subproject commit b1fbe0ffe665bfb609baa4b2ca5d04d3ed6ba241

2
openslides-client

@ -1 +1 @@
Subproject commit 197d552083287d418387556b99a755fa81abb29a
Subproject commit 626b43dfd0adf6c1c958a37e63c9de745b360a0e