Commit Graph

325 Commits

Author SHA1 Message Date
Anton Georgiev
5961797433 build(fsesl-akka): build deps in sequence to allow for ci use 2022-05-30 20:22:18 +00:00
Daniel Schreiber
1a12514b61 Fix(build): add service dependency to redis for several services
* fix unit name: the unit name on Ubuntu is `redis-server.service`
* services which need a working redis require both After= and Wants=

See the description in the `systemd.unit` man page.
2022-05-29 22:31:03 +02:00
Anton Georgiev
b5241d0ee9
Merge pull request #15022 from schrd/etherpad-clusterproxy-fix
Fix etherpad session authentication to work in cluster setups
2022-05-18 12:44:17 -04:00
Daniel Schreiber
dfd93e7959 Fix etherpad session authentication to work in cluster setups
Etherpad uses the sessionID cookie for authorization. In cluster setups the
host part of the URI which serves the html5 frontend is different from
the hostname part of the URI which serves etherpad. Therefore the
bbb-html5 client can't set a cookie for etherpad which contains the
etherpad sessionID.

This patch uses the `ep_auth_session` etherpad plugin which takes the
`sessionID` as query parameter, sets the cookie in the browser and
redirects the iframe to the pad URI.
2022-05-16 07:40:42 +02:00
Fred Dixon
ef6eb21cce Minor refactoring of propagating new version 2022-05-15 13:58:25 -05:00
Anton Georgiev
c4874398f6 chore: Merge 2.5.0-rc.2 into develop 2022-05-13 21:03:34 +00:00
Anton Georgiev
fd5d3cbfac
Merge branch 'v2.5.x-release' into default-nginx-config 2022-05-13 10:23:38 -04:00
Anton Georgiev
61d27c78f7 build: set html5 client version on bbb-config update 2022-05-13 13:50:20 +00:00
Gustavo Trott
4c27159ee9
Merge pull request #14990 from antobinary/ci
build(fsesl-akka): build deps in sequence to allow for ci use
2022-05-10 13:32:51 -03:00
Anton Georgiev
653dd8a08f build(fsesl-akka): build deps in sequence to allow for ci use 2022-05-10 16:22:28 +00:00
Ramon Souza
07f9a192b9 Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-2425-apr27 2022-04-27 15:32:20 -03:00
Brent Baccala
c9606257aa package build scripts - calculate GIT_REV and COMMIT_DATE outside the
docker container and pass them in as environment variables, since we
can't compute them inside the docker container if the source directory
is a git worktree
2022-04-26 10:51:29 -04:00
Calvin Walton
09124ab06c packaging: Add dependencies on yq 3
yq package is now provided in the BigBlueButton support PPA for BBB 2.5,
so we can depend on the package now. Ensure the dependency is specific
to avoid an incompatible yq version 4 from being installed.
2022-04-25 15:04:38 -04:00
Ramon Souza
c96c47e551 update bbb-html5 build scripts for meteor 2.7.1 2022-04-25 13:11:12 -03:00
Daniel Schreiber
5d3b8cdc66 build: fix bbb-html5 nginx site config 2022-04-04 23:45:03 +02:00
Daniel Schreiber
52112cde87 build: allow bbb nginx config hook for operators
Sometimes operators need to tweak the nginx config. They should not
modify config files provided by the packages. Instead they should add
their own config files in `/etc/bigbluebutton/nginx/`. This patch links
the default config provided by packages into this directory.
2022-04-04 22:30:49 +02:00
Anton Georgiev
97dbc1aeb6
Merge branch 'v2.5.x-release' into bbb-target 2022-04-01 14:21:15 -04:00
Bohdan Zhemelinskyi
51032dd593 fix disable THP called too often 2022-04-01 14:43:48 +00:00
Anton Georgiev
84821f47bc chore: move sox dependency to Dockerfile 2022-03-31 01:39:46 +00:00
Anton Georgiev
5926217199 build: drop net-tools from bbb-freeswitch-core 2022-03-30 14:57:15 +00:00
Anton Georgiev
fc688f2038 Merge branch 'meteor-261' of github.com:ramonlsouza/bigbluebutton into meteor-261 2022-03-29 20:27:26 +00:00
Anton Georgiev
ee9a0146a8 build: move ruby-bundler libsystemd-dev to docker image 2022-03-29 20:09:44 +00:00
Anton Georgiev
0836351747
Merge pull request #14662 from danimo/recordplaybackfix
make bbb-record-core package install again on focal
2022-03-29 15:04:07 -04:00
Calvin Walton
c722b799be bbb-record-core: Use bundler deployment option
This makes the bundle install error out if the Gemfile.lock is out of
date (Gemfile was updated) rather than silently updating it during the
build.
2022-03-29 12:52:12 -04:00
Calvin Walton
98dfb2789a bbb-record-core: Use bundler from ruby-bundler package 2022-03-29 11:28:02 -04:00
Calvin Walton
cbaae2c753 Update bbb-record-core dependencies.
Since gems are no longer being built during package install, dev
packages are no longer needed. Install the runtime libraries instead.

Drop the libxslt & libxml dependencies, since current nokogiri versions
used bundled copies of those libraries.
2022-03-29 11:06:00 -04:00
Fred Dixon
08c6ad67fb
Update after-install.sh
Make check for worker_rlimit_nofile silent
2022-03-27 09:09:52 -04:00
Fred Dixon
50498354f0 Add needed dependency to get IP address 2022-03-26 17:07:14 -05:00
Fred Dixon
4707bf839b Fix #14670 2022-03-26 17:06:51 -05:00
Daniel Molkentin
dc012a2548 fix(bbb-record-core): make package install again on focal
Now uses Ubuntu's bundler version to install all dependencies at build time
rather than install time. Gems are also now vendored, and no longer pollute the
operating system.
2022-03-23 22:55:04 +01:00
Anton Georgiev
6b4a7ff898 refactor: swap netstat with ss 2022-03-23 20:50:19 +00:00
Daniel Molkentin
9c4fc8ccf1 chore: net-tools -> iproute2
Ensure code duplication is at least documented and end the feature
disparity between files.
2022-03-22 16:30:43 +01:00
Anton Georgiev
33a2dd566c build: do not delete .nginx file, it is removed on upgrade too 2022-03-18 19:02:46 +00:00
Daniel Molkentin
91c882862e fix paste error 2022-03-17 16:06:42 +01:00
Daniel Molkentin
61ce7ab9b6 inject dependency to bigbluebutton.target into externally provided services 2022-03-17 15:29:02 +01:00
Daniel Molkentin
8b8854a008 make bbb-pads.service part of bigbluebutton.target 2022-03-17 15:15:21 +01:00
Daniel Molkentin
dbae417b0c akka apps should not have override files
they are already provided by sbt
2022-03-17 13:03:32 +01:00
Daniel Molkentin
568756bf7e move systemd files to /lib/systemd/system 2022-03-17 13:03:15 +01:00
Daniel Molkentin
9f833a4760 Introduce bigbluebutton.target 2022-03-17 11:35:42 +01:00
Anton Georgiev
5db05bdad8 fix: set repo.artima.com/releases to https 2022-03-16 19:20:26 +00:00
Anton Georgiev
f4c5ce50b6 build: bbb-web require openjdk-11-jdk not 8 2022-03-16 19:04:47 +00:00
Anton Georgiev
c261c542ca build: adapt packaging for java 11 2022-03-16 18:31:49 +00:00
Anton Georgiev
9705ac99b0
Merge pull request #14607 from pedrobmarin/b-e-fua
build(etherpad): forbid userName argument
2022-03-16 12:23:27 -04:00
Anton Georgiev
06d2652714 build: do not remove /usr/share/bigbluebutton/nginx/web on upgrade 2022-03-16 16:19:55 +00:00
Anton Georgiev
405d326ea7
Merge branch 'v2.5.x-release' into meteor-261 2022-03-16 11:55:31 -04:00
Pedro Beschorner Marin
06397cae49 build(etherpad): forbid userName argument
Since bbb-pads user's name is set internally by akka-apps and bbb-pads internal
credentials exchange. Yet, Etherpad's embedded URL params still work and the user
could use it to ovewrite.

Use nginx rules to block an access attempt that contains the userName argument.
2022-03-16 12:48:08 -03:00
Anton Georgiev
d00d6a0323
Merge pull request #14600 from bigbluebutton/transition-to-focal
!build and conf: Upgrade Ubunto to 20.04
2022-03-16 08:54:56 -04:00
Anton Georgiev
d1f7d6eda4 build: recover presentation-slides.nginx 2022-03-15 03:20:28 +00:00
Anton Georgiev
3b476935b8 build: add missed loadbalancer.nginx 2022-03-15 02:47:22 +00:00
Anton Georgiev
c3242c8003 build: nginx from /usr/share/bigbluebutton/nginx 2022-03-15 02:01:37 +00:00
Anton Georgiev
4e6b0a608e refactor: store nginx files in /usr/share/bigbluebutton/nignx not /etc/bigbluebutton/nginx 2022-03-15 01:42:28 +00:00
Anton Georgiev
9653c0882a build: re-enable FreeSWITCH patch 1531 2022-03-15 01:36:45 +00:00
Anton Georgiev
1f0b58a87e build: re-add sfu as a dependency to bbb-html5 2022-03-15 00:23:39 +00:00
Anton Georgiev
d5b1fe50a0 build: add mongodb-org as bbb-html5 dependency 2022-03-14 23:15:26 +00:00
Anton Georgiev
3a875efd8b build: change bionic to focal in build scripts 2022-03-14 23:01:05 +00:00
Anton Georgiev
7775d06725 build: create /etc/nginx/sites-enabled if needed 2022-03-14 20:38:54 +00:00
Anton Georgiev
9e6c078703 build: use tomcat9 not tomcat10 2022-03-14 20:38:31 +00:00
Anton Georgiev
c2ee473f7c must revert! build: temp drop bbb-webrtc-sfu as a dependency 2022-03-14 20:04:36 +00:00
Anton Georgiev
20bff96cbf must revert! build: temp drop yq as a dependency 2022-03-14 19:39:11 +00:00
Anton Georgiev
3de540f0ab build: swap bionic with focal 2022-03-14 19:04:23 +00:00
Anton Georgiev
7147045a82 build: renamed opts-bionic to -focal 2022-03-14 18:53:35 +00:00
Anton Georgiev
821adcdc8c
Revert "build and conf: Upgrade tomcat8 to 10 for bbb-demo" 2022-03-14 13:48:37 -04:00
Anton Georgiev
afc231c22b build and conf: tomcat10 for bbb-demo 2022-03-14 17:12:23 +00:00
Fred Dixon
952037e4b5
Reduce volume for mute/unmute sound 2022-03-14 10:10:27 -04:00
Fred Dixon
a2797304d4 Add back lines to fetch sounds.tar.gz 2022-03-14 07:53:00 -05:00
Fred Dixon
3ff06be533 replace muted/unmuted with sounds from senfcall.de (thanks) 2022-03-13 17:40:13 -05:00
Fred Dixon
a688f851af Use default compiler optimizations for FreeSWITCH 2022-03-13 15:39:42 -05:00
Anton Georgiev
d20e276b58 build: bbb-etherpad set npm to 6.14.11 2022-03-12 20:53:17 +00:00
Anton Georgiev
95ad4afc98 build: bbb-etherpad add logs; comment out #14583 2022-03-11 16:04:42 -05:00
Anton Georgiev
fc071568c4 build: bbb-etherpad missing deps, hacky rm package.json 2022-03-11 18:45:01 +00:00
Ramón Souza
ce9fef4cd0 resolve build file conflict 2022-03-10 14:25:38 +00:00
Anton Georgiev
6ce903a2fb !!!build: FS - drop Marios patch TEMP TEMP 2022-03-10 02:24:50 +00:00
Anton Georgiev
4c7b780d25 build: tomcat8->10 for bbb-demo 2022-03-10 02:09:38 +00:00
Ramón Souza
ae5e116e16 Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-24-25-mar09 2022-03-09 20:40:07 +00:00
Ramón Souza
ec18a97181 update node version in build files 2022-03-09 17:34:21 +00:00
Max Franke
36e3db4625 fix(etherpad): avoid icons overlapping 2022-03-09 11:29:34 -03:00
Pedro Beschorner Marin
93767d19fe build(etherpad): v1.8.17
Update Etherpad version and settings file.
2022-03-07 17:16:52 -03:00
Anton Georgiev
1b62b9abce build: drop empty scripts 2022-03-06 03:47:34 +00:00
Anton Georgiev
51c1c2f2da build: sites-enabled/bigbluebutton is now removed in bbb-html5 postrm 2022-03-06 03:41:43 +00:00
Anton Georgiev
36ce5cb1c7 build: remove obsolete libreoffice-docker related code 2022-03-06 03:39:59 +00:00
Anton Georgiev
d75c78983a build: remove verto related code 2022-03-06 03:39:00 +00:00
Anton Georgiev
60d99bbea2 build: remove red5 related code 2022-03-06 03:38:25 +00:00
Anton Georgiev
16ddf3d5e3 fix: bbb-demo, ship empty bbb_api_conf.jsp, populate in --setip 2022-03-04 17:21:38 +00:00
Anton Georgiev
92817a9ee3 chore: Drop fpm flags --deb-user etc. #14110 2022-03-03 21:48:46 -05:00
Anton Georgiev
d06e51031f build(bbb-lti): handle extra level bbb-lti dir 2022-03-03 21:46:22 -05:00
Anton Georgiev
57776054b7
Merge pull request #14512 from prlanzarin/u25-nest-5900pn
refactor: reduce timeout intervals for webrtc-sfu and FS WebSocket proxies
2022-03-03 15:27:37 -05:00
Daniel Schreiber
0d30c9e0ad build: enable G722 by default
currently it is enabled in the config but the module is not loaded.
2022-03-03 14:33:14 +01:00
Fred Dixon
7fc2c96d2a
Merge pull request #14485 from antobinary/drop-tmp-settings
!build: remove config storing to /tmp when upgrading a package
2022-03-02 22:10:18 -06:00
prlanzarin
22d347f899 refactor: reduce timeout intervals for webrtc-sfu and FS WebSocket proxies
The old 6h values seem far too large and I cant recall nor find any good
justification for them to be that way

Reducing the timeouts to more sane values allow resources (WebSockets) to be
cleaned up faster

The heartbeat routine in bbb-webrtc-sfu runs every 20s. The heartbeat
routine in SIP.js/FS runs every 30(+10)s. The new timeouts are those values
multiplied by 3.
2022-03-02 19:07:29 -03:00
Anton Georgiev
9f6c6b7a0b
Merge pull request #14441 from pedrobmarin/r-s-fpr
refactor(screenshare): FreeSWITCH partial removal
2022-03-02 08:36:14 -05:00
Anton Georgiev
abca31a464
Merge branch 'v2.5.x-release' into drop-tmp-settings 2022-02-28 13:33:05 -05:00
Anton Georgiev
8674cf7615 !build: remove config storing to /tmp when upgrading a package
Remaining, to be handles separately:
bbb-html5 before-remove and after-install -- sip.nginx needs to be
handled in bbb-conf
bbb-freeswitch-core -- /tmp/vars xml, etc. -- not sure how to handle
2022-02-27 19:08:25 +00:00
Anton Georgiev
8344fe0daa build: drop ubuntu trusty (or xenial) files 2022-02-27 03:00:20 +00:00
Anton Georgiev
d58b86cbe5 build and config: drop references to tomcat6 or 7 2022-02-27 02:56:27 +00:00
Anton Georgiev
c8b6e7515c build: drop stuntman-client dependency, obsolete 2022-02-27 02:41:40 +00:00
Anton Georgiev
bd27806a27 build: FreeSWITCH mod_av not used, drop build 2022-02-27 02:40:35 +00:00
Anton Georgiev
146c81a4de build: check by distro name not release num - easier to copy-replace (consistency) 2022-02-27 02:38:29 +00:00
Anton Georgiev
bac60f5891 build: remove obsolete bbb-html5-worker@.service 2022-02-27 02:37:18 +00:00
Anton Georgiev
b88dc515ba build: drop bionic dir in bbb-html5 2022-02-27 02:36:36 +00:00
Anton Georgiev
b1018feec0 build: set BBB full version in settings.yml 2022-02-25 16:20:16 +00:00
Ramón Souza
138f4d64e4 Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release 2022-02-24 14:49:56 +00:00
Pedro Beschorner Marin
6d80a413cf refactor(screenshare): FreeSWITCH partial removal
Remove part of the old FreeSWITCH dependent WebRTC screenshare feature.
2022-02-23 13:03:51 -03:00
Fred Dixon
9f27c9b36d Fix log permissions for bbb-fsesl-akka 2022-02-19 19:45:45 -06:00
Fred Dixon
c9f18cbdf6 Need bbb-pads to be dependent on bbb-web 2022-02-19 19:38:54 -06:00
Fred Dixon
86c742137d removed in favor of #14412 2022-02-19 19:01:37 -06:00
Fred Dixon
a982aeaec8 Set public.pads.url for bbb-pads 2022-02-19 18:17:48 -06:00
Anton Georgiev
eb7c11acf6 build: Use $1 if no EPOCH in akka-fsesl version 2022-02-19 08:53:36 +00:00
Anton Georgiev
95d0f1b642 build: Use $1 if no EPOCH in akka-apps version 2022-02-19 08:51:40 +00:00
Anton Georgiev
f86fd0fe80
Merge pull request #14392 from zhem0004/fixSystemdIn2.5
fix: change StartLimitAction to none
2022-02-17 13:21:18 -05:00
Anton Georgiev
db6941970c build: automatically set BBB version in settings.yml 2022-02-17 17:21:02 +00:00
Anton Georgiev
7c03e8d873
build: Set bbb-html5 client built in settings.yml
"html5ClientBuild: HTML5_CLIENT_VERSION"
2022-02-17 10:06:50 -05:00
Bohdan Zhemelinskyi
172cc02b0b changeStartLimitActionToNone 2022-02-17 15:05:18 +00:00
Anton Georgiev
eb9cea331f
Merge pull request #14389 from gustavotrott/sbt-force-update
fix: Force update of common-message and common-web libs
2022-02-17 09:11:05 -05:00
Gustavo Trott
def7fc65c3 Update common-message and common-web using sbt update 2022-02-17 10:58:41 -03:00
Fred Dixon
5b7a261148 Disable login for freeswitch and meteor users 2022-02-16 16:50:58 -06:00
Anton Georgiev
75983c6646
Merge pull request #14377 from gustavotrott/build-scripts-clear-jar-cache
(build) Clear cache before publish common-message and common-web
2022-02-16 09:06:49 -05:00
Gustavo Trott
25210738e5 Clear cache of common-message and common-web before publish 2022-02-16 10:59:32 -03:00
Anton Georgiev
9f9184c749
Merge pull request #14368 from gustavotrott/soffice-docker-set-timeout
fix: Use the config officeToPdfConversionTimeout in the Office conversion Docker
2022-02-16 08:46:42 -05:00
Gustavo Trott
8a1e527da4 Add timeout param to Etherpad sudoers command 2022-02-16 10:01:57 -03:00
Gustavo Trott
7c128ce7d4 Adds soffice timeout to build script 2022-02-16 09:51:44 -03:00
Anton Georgiev
6fe2b69dc7
Merge pull request #13572 from zhem0004/13257
Implemented the fix regarding mongod error messages
2022-02-15 16:55:52 -05:00
Anton Georgiev
023455575f
fix(FS): Allow patch with different whitespace 2022-02-15 15:47:28 -05:00
Ramón Souza
dba04834c7 Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08 2022-02-09 15:52:42 +00:00
Pedro Beschorner Marin
f9030bb185
build(etherpad): add soffice path
Enable PDF, ODT and DOCX Etherpad's content exportation.
2022-02-03 17:48:24 -03:00
Fred Dixon
e7562a3af1 Update FreeSWITCH build to apply https://github.com/signalwire/freeswitch/pull/1531 2022-02-02 22:01:19 -06:00
Fred Dixon
50527d3186 Remove trusty build script 2022-02-02 20:25:58 -06:00
Fred Dixon
13fa124740 Fix permissions for settings.yml 2022-02-02 09:26:19 -06:00
Daniel Schreiber
dc15a1c707 fix: serve compressed Javascript and CSS
The BBB html5 client is huge and can be compressed easliy. As nginx
already services the static files, it can also handle service gzipped
files.

Ship compressed files with the package.
2022-01-31 20:44:43 +01:00
Anton Georgiev
0c9de5746f build: drop xenial related files 2022-01-27 19:42:07 +00:00
Anton Georgiev
8237862117 build: resolve conflicts opts dependencies 2022-01-27 19:18:59 +00:00
Anton Georgiev
46cb753c44 Merge branch 'dev-24-0125' of github.com:ramonlsouza/bigbluebutton into merge-jan-27 2022-01-27 16:03:12 +00:00
Pedro Beschorner Marin
0e01274eaf fix(build): missing bbb-pads
Add bbb-pads at bigbluebutton's build packages list
2022-01-26 15:14:27 -03:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Pedro Beschorner Marin
becce20fa5 fix(pads): add double quotes to APIKEY
JSON file format requires double quoted string data. Add quotes when configuring
ETHERPAD_API_KEY at bbb-pads build scripts.
2022-01-25 08:47:24 -03:00
moonlies
f057671122 fix missing directory error for etherpad installation 2022-01-22 23:35:07 +01:00
Pedro Beschorner Marin
810deb907b refactor(etherpad): access control et al.
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.

- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads)
- Included access control both in akka-apps and bbb-pads
2022-01-21 16:56:01 -03:00
Fred Dixon
8ccd896e92
Merge pull request #14110 from schrd/filepermissions
Fix: ensure services can't modify their code
2022-01-16 23:15:24 -04:00
Daniel Schreiber
5cce940346 Fix: ensure services can't modify their code
Code should be owned by root, so an attacker cannot modify it. The same
should apply to systemd unit files.

closes #11752
closes #10831
2022-01-16 18:10:09 +01:00
Anton Georgiev
10aaf8071f build: Added auto restart of bbb-html5-backend and frontend on failure 2022-01-13 21:13:19 +00:00
Ramón Souza
f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial 2022-01-12 16:40:45 +00:00
Anton Georgiev
62040bdcb3 build: use official ep_cursortrace 2021-12-20 14:35:43 +00:00
Pedro Beschorner Marin
d592c11062 build(etherpad): bump v1.8.16 2021-12-16 15:04:26 -03:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Anton Georgiev
aa03a8093b
Merge pull request #13827 from prlanzarin/u24-desolation-seed
chore: add user infos in custom HTTP headers to checkAuthorization's OK, forward them to SFU
2021-12-06 12:34:40 -05:00
prlanzarin
896f629a94 chore: pipe user info from bbb-web checkAuth to webrtc-sfu 2021-12-03 19:49:27 +00:00
Anton Georgiev
578332a094
Merge pull request #13731 from schrd/cluster_proxy
Allow BBB to run behind a proxy the avoid gUM permission queries per node
2021-12-03 11:32:07 -05:00
Anton Georgiev
229580db40 build: disable JS execution in mongodb 2021-12-02 22:13:36 +00:00
Tainan Felipe
12117164d6 disable JS execution in mongodb 2021-12-02 09:51:21 -03:00
Anton Georgiev
20a953373f
build: Update the Maintainer field for bigblutbutton 2021-11-22 15:15:30 -05:00
Daniel Schreiber
c97c033cfd Update packaging and nginx config for loadbalancer
To ease setup some changes required in the nginx config for load
balancer setup are prepared here. They do not harm non-loadbalancer setups.

The changes in the system startup scripts are mandatory
2021-11-21 21:12:50 +01:00