Commit Graph

29 Commits

Author SHA1 Message Date
Oskar Hahn
d7d8dcb3c9 Fix Development 2021-02-05 19:26:04 +01:00
Emanuel Schütze
d05958ca10
Merge pull request #5851 from ostcar/caddy
Use caddy
2021-02-05 18:17:51 +01:00
Gernot Schulz
f7d228a600 Docker: Update build scripts for Caddy
For now, keep using HAProxy's name in most places, e.g.,
DOCKER_OPENSLIDES_HAPROXY_NAME.  To avoid confusion, the specific
mentions of HAProxy should be made more generic, e.g.,
DOCKER_OPENSLIDES_PROXY_NAME.
2021-02-05 18:00:04 +01:00
Gernot Schulz
40dc0e08fa Caddy: Add config to image instead of using a volume 2021-02-05 17:59:57 +01:00
Norman Jäckel
cc5bcf1a81 Updated README 2021-02-05 12:01:48 +01:00
Finn Stutzenstein
9e38ed955f
Fix docker compose dev 2021-02-05 12:00:11 +01:00
Oskar Hahn
dc58752575 Use caddy 2021-02-04 20:54:57 +01:00
Finn Stutzenstein
8049bfa91e
Performance improvements for OS3+
- Cleans up log messages in the client
- Refactored the autoupdate bundle code into an own file
- Added bulk creates for History in Postgresql. This is the only database system
  that supports returning all ids whan multiple elements are inserted. We can
  make usage out of it.
- Added a `disable_history`, that is request-wide
- Disabled history on poll vote requests
- Removed unnecessary user ordering
- Reduced the queries for creating motion vote objects by one
- removed final_data: This was not prefetched. Using the normal data collection
  the data is prefetched
- removed unnecessary user query if vore delegation is not used
2021-01-21 12:53:51 +01:00
FinnStutzenstein
e225a57f97
OpenSlides3+: External Autoupdate Service
- Removing channels. Going back to a wsgi deployment
- Removed server projector code
- Autoupdate throttling is now in the client
- New communication stack in the client
- Adopted all deployment methods: Docker stack and docker compose (prod and dev)
- Added autoupdate service as submodule
2021-01-14 07:55:41 +01:00
Finn Stutzenstein
0c66afc34a
Add env variables for media cache 2020-11-05 16:19:44 +01:00
Finn Stutzenstein
6943c3d18f
Expose more email settings 2020-11-02 07:26:09 +01:00
Gernot Schulz
2305ca9d21 Docker config: Quote env vars read by m4 2020-10-20 12:05:11 +02:00
Emanuel Schütze
21990aa568
Merge pull request #5602 from FinnStutzenstein/addDemoModeToDocker
Add demo mode to all docker setups
2020-10-07 23:30:35 +02:00
Finn Stutzenstein
fd2fd8d73a Add demo mode to all docker setups 2020-10-07 16:50:08 +02:00
Manfred Löbling
49a3bcd930 admin.env is not loaded. docker-*.m4 defines ADMIN_SECRET_AVAILABLE if adminsecret.env is present 2020-10-01 13:30:25 +02:00
Gernot Schulz
ed9e50a1b4 Docker templates: Set empty values instead of None 2020-09-10 10:12:16 +02:00
Gernot Schulz
a408ee62ee Docker build.sh: Run aux build scripts in subshell 2020-09-07 10:29:18 +02:00
Sean
0933bb6abd Change jitsi_password to jitsi_room_password
Fixes false naming in both documentation, template
and docker
2020-08-21 15:46:43 +02:00
Gernot Schulz
8faa2ad38f
Docker: Add --ask-push option to build.sh 2020-08-21 08:11:16 +02:00
Gernot Schulz
9a2d3a3760
Docker: Add SAML configuration
To configure SAML, ENABLE_SAML must be set to True in .env.
Additionally, the following files must be provided in ./secrets/saml/:

  - sp.crt
  - sp.key
  - saml_settings.json

The files will be added as Docker secrets.

Even though saml_settings.json does not contain secret information
per se it is nonetheless added as a secret for simplicity.  Technically,
the file is equally suited to be configured as a "Docker config".

Please note:

  - This patch has not been tested yet.
  - python3-saml's version should probably be pinned.
2020-08-21 08:11:16 +02:00
Gernot Schulz
2b7e4d3d19
Docker: Add backend variables to .env and templates
This setup chooses to avoid the env_file option available for Docker
Compose files.  Docker has a peculiar way of parsing variables which
makes it, for example, include quotes verbatim.

This is both confusing and incompatible with shells parsing the same
file which is a requirement.  For this reason, the configuration does
not import the complete environment using env_file but assigns variables
explicitly on a need-to-know basis in the YAML file, much like Docker
secrets.

Since the configuration is generated automatically, the burden on users
is the same as with env_file: they only need to edit .env for
customizations.
2020-08-21 08:11:15 +02:00
Gernot Schulz
d1640bc98d
Docker: Add .env
This file was copied from
https://github.com/OpenSlides/openslides-docker-compose/
and still needs to be adjusted for the present setup.
2020-08-21 08:11:15 +02:00
Gernot Schulz
1c0724341c
build.sh: More convenient way to push images
Since build.sh now builds more than just two images, individual queries
whether to push each image to a registry may become tedious.  This patch
replaces the queries with a single checklist menu.  After making
a selection, the images get pushed all at once.

In the menu, all images are unchecked by default in order to prevent
accidental uploads.  This, too, may become tedious.  In that case, the
default could be flipped or a new option could be introduced.
2020-08-21 08:11:15 +02:00
Gernot Schulz
418480bff5
build.sh: Make build script more useful
build.sh replaces docker-compose as an image build tool.  Instead, all
OpenSlides services can be built using this script which offers various
important options such as tagging and configurable defaults.

The now-redundant build instructions have been removed from the YAML
templates.

The almost identical server and client build scripts have been made
fully identical.
2020-08-21 08:11:15 +02:00
Gernot Schulz
9c9f268fbf
Docker: Shorten server-db-setup service name 2020-08-21 08:11:15 +02:00
Gernot Schulz
63c4bc3ff7
build.sh: Build config from template 2020-08-21 08:11:14 +02:00
Gernot Schulz
4f194a8794
Docker: Add a Docker secret for the Django key
We have decided against including an insecure default key with a mere
warning.  Therefore, unlike the admin and user secrets, the availability
of this secret is a hard requirement.  The instance will not be able to
start before a secret has been generated manually or by a management
tool.
2020-08-21 08:11:14 +02:00
Gernot Schulz
d48794ae8a
Docker: Add YAML templates
These templates were copied from
https://github.com/OpenSlides/openslides-docker-compose and adapted for
the new server-db-setup service.
2020-08-21 08:11:14 +02:00
FinnStutzenstein
2bcab5d098
Repository restructure
- moved all server related things into the folder `server`, so this
configuration is parallel to the client.
- All main "services" are now folders in the root directory
- Added Dockerfiles to each service (currently server and client)
- Added a docker compose configuration to start everything together.
Currently there are heavy dependencies into https://github.com/OpenSlides/openslides-docker-compose
- Resturctured the .gitignore. If someone needs something excluded,
please add it to the right section.
- Added initial build setup with Docker and docker-compose.
- removed setup.py. We won't deliver OpenSlides via pip anymore.
2020-08-21 08:11:13 +02:00