Commit Graph

8102 Commits

Author SHA1 Message Date
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
3cb3ef2974
README: Include production setup info
Now that this repository has become the entry point through which
OpenSlides instances are configured, this patch transfers some relevant
information formerly included in
https://github.com/OpenSlides/openslides-docker-compose/ to this
repository's README file.
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
f694e9b2c4
Update AUTHORS 2020-08-21 08:11:15 +02:00
Gernot Schulz
774fa4c204
README: Typos, language, formatting 2020-08-21 08:11:15 +02:00
Gernot Schulz
13db5687cb
README: Add Django secret info 2020-08-21 08:11:14 +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
Gernot Schulz
683aed56bb
server: Fix exec args in entrypoint 2020-08-21 08:11:14 +02:00
Finn Stutzenstein
030378b48a
Rebase changes for current master 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
Finn Stutzenstein
2c85bb28f1
Merge pull request #5504 from tsiegleauq/demo-mode
Add demo mode
2020-08-21 08:10:45 +02:00
Sean
fbf424e570
Add demo mode
Adds a demo mode in the settings.py to prevent certain obvious
kinds of vandalism on public openslides testing instances
2020-08-17 07:25:53 +02:00
Finn Stutzenstein
2e8e32454e
Merge pull request #5508 from FinnStutzenstein/restartPostgresIdSequence
Fixed errors while creating countdown due to postgres id sequences
2020-08-14 11:15:09 +02:00
Finn Stutzenstein
389a244615
Fixed errors while creating countdown due to postgres id sequences 2020-08-14 10:30:33 +02:00
Emanuel Schütze
a46d8ec7ad
Merge pull request #5506 from tsiegleauq/update-to-tinymce-5.4.1
Update TinyMCE and TinyMCE angular
2020-08-13 20:03:02 +02:00
Sean
b59c69e086 Update TinyMCE and TinyMCE angular
Updates TinyMCE and TinyMCE angular to the latest version
2020-08-13 12:27:14 +02:00
Emanuel Schütze
2b3766b758
Merge pull request #5502 from tsiegleauq/enter-animation-without-css
Replace meeting room keyframe animation
2020-08-12 18:43:50 +02:00
Sean
c0f5c7b548 Replace meeting room keyframe animation
Replaces the meeting room keyframe css animation with anuglar
animations.
The css keyframe animation declaration was
"optimized away" on prod build
2020-08-12 18:18:04 +02:00
Emanuel Schütze
c6abbb629e
Merge pull request #5505 from tsiegleauq/multiple-file-download
Download mutliple files as zip
2020-08-12 17:13:41 +02:00
Emanuel Schütze
a40657e153
Merge pull request #5495 from FinnStutzenstein/redisConnectionError
Ping redis connection when popped from pool
2020-08-12 17:00:13 +02:00
Sean
e75573e139 Download mutliple files as zip
Adds the possitibility to download folders
and multiple files as zip.
2020-08-12 15:24:37 +02:00
Emanuel Schütze
5f5f704057
Merge pull request #5498 from tsiegleauq/jitsi-meet-api-update
Update jitsi-meet external api
2020-08-12 15:05:29 +02:00
Emanuel Schütze
b726801747
Merge pull request #5500 from tsiegleauq/crate-users-svc
Add "create user" to more search value selectors
2020-08-12 15:00:55 +02:00
Emanuel Schütze
a48592af50
Merge pull request #5497 from tsiegleauq/fix-parent-motion-title-change-error
Cleaner pdf getUnifiedChanges solution
2020-08-12 14:49:33 +02:00
Emanuel Schütze
72a53c5cd0
Merge pull request #5501 from FinnStutzenstein/fixes
Fixed poll required users and motion state extension selector
2020-08-12 14:43:25 +02:00
Finn Stutzenstein
d682d0d134
Fixed poll required users and motion state extension selector 2020-08-11 13:21:51 +02:00
Sean
bfe72497cd Add "create user" to more search value selectors
Adds the "create new user" function to more search value
selectors.
2020-08-11 12:15:47 +02:00
Finn Stutzenstein
c6bc5978e2
Ping redis connection when popped from pool 2020-08-10 16:31:38 +02:00
Sean
65ee468c21 Update jitsi-meet external api
Updates jitsi-meet external api the the current version
Hide "security" and "invite" in jitsi-iFrame
2020-08-10 15:37:14 +02:00
Sean
09a10c7e92 Cleaner pdf getUnifiedChanges solution
Fixes a bug where cercain amendments where causing an
"titleChange of undefined" error
2020-08-10 14:17:43 +02:00
Finn Stutzenstein
ccc3e38427
Merge pull request #5494 from manuelgrabowski/patch-1
Fix typo
2020-08-10 10:06:36 +02:00
Manu
8d25f6ae15
Fix typo 2020-08-09 00:21:33 +02:00
Emanuel Schütze
23ae32a758
Merge pull request #5480 from tsiegleauq/amendment-without-parent-motion
Detect if the parent motion was deleted
2020-07-17 16:55:47 +02:00
Emanuel Schütze
fbbcd6fa94
Merge pull request #5479 from tsiegleauq/config-amendments-workflow
Add "motions_amendments_workflow" config
2020-07-17 16:51:34 +02:00
Sean
2c17d7b7aa Add "motions_amendments_workflow" config
Adds a config for the default workflow for amendments and maked the
necessary changes to motion detail and amendment wizzard
2020-07-17 16:10:45 +02:00
Sean
e268903536 Detect if the parent motion was deleted
Fixes an error where the motion detail page would not open if the parent
motion to an amendment was deleted.
Show a warning if the parent motion to an amendment is missing
2020-07-17 16:08:15 +02:00
Emanuel Schütze
6e2e1ebe7a
Merge pull request #5473 from emanuelschuetze/release3.2
Release 3.2
2020-07-15 16:56:33 +02:00
Emanuel Schütze
30e8f7d87f Updated to version 3.3-master 2020-07-15 16:19:05 +02:00
Emanuel Schütze
9aefb122e6 Release 3.2 2020-07-15 16:16:00 +02:00
Emanuel Schütze
5618c04416 Use twisted[tls] in production.txt to install required packages. 2020-07-15 16:15:39 +02:00
Emanuel Schütze
ee344032b7
Merge pull request #5472 from emanuelschuetze/changelog
Updated Changelog for 3.2
2020-07-15 14:15:52 +02:00
Emanuel Schütze
6e80ff5f00 Updated Changelog for 3.2 2020-07-15 12:45:16 +02:00
Emanuel Schütze
47113f14fc
Merge pull request #5470 from tsiegleauq/cannot-click-bg
Fix clicking behind conference bar
2020-07-15 12:43:10 +02:00
Sean
7d912d82de Fix clicking behind conference bar
Fixes an issue with the live stream.
Clicks in the background were falsely cought.
2020-07-14 15:10:01 +02:00