forked from External/greenlight
60cf5f7440
* Fix wrong conditional (reported by LGTM) (#1477)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
* Bump rack from 2.2.2 to 2.2.3 (#1839)
Bumps [rack](https://github.com/rack/rack) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.2...2.2.3)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* [FIX] Unable to edit long recording names #1776 (#1780)
* Allow to set a filter for LDAP authentication
* [FIX] Unable to edit long recording names #1776
Co-authored-by: François Ménabé <francois.menabe@unistra.fr>
Co-authored-by: farhatahmad <ahmad.af.farhat@gmail.com>
* Desgin for Manage Users Tabs (#1777)
* Update _subtitle.html.erb
* Update _manage_users_tags.html.erb
* Update admins.scss
* Update _primary_themes.scss
* Update _manage_users_tags.html.erb
* Minor style changes to manage users (#1845)
* Maintenance banner moved to admin site (#1775)
* initial
* finish
* travis fixes
* travis again
* not required
* Co-authored-by: Tobias Fiebig <t.fiebig@tudelft.nl> (#1296)
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
* Enhance Room OpenGraph Metadata (#1601)
* Revert "Enhance Room OpenGraph Metadata (#1601)" (#1852)
This reverts commit 3b007c233a.
* GRN2-xx: Tab title now displays the current page name (#1853)
* Tab title now displays the current page name
* Added page title for the rest of the pages
* Split Site Settings into 3 different tabs (#1858)
* Split Site Settings into 3 different tabs
* Fix copyright
* Added redirect to correct tab
* Make sure settings are displaying when they should
* Update en.yml (#1857)
* Build images for alpha branches (#1867)
* Upgraded jquery to latest version (#1896)
* Added favicon tag (#1898)
* Fixed XSS issue with role name (#1899)
* Update path for coloring redirect (#1908)
* Added a fourth section to the room uid (#1910)
* Fixed issue with insecure room sharing removal (#1914)
* Fixes typo (#1917)
Fixes typo: successfully was written incorrect.
* Fixed order of rooms in server rooms (#1915)
* Change default room sort to latest activity (#1919)
* GRN2-xx: Small changes/improvements to the recording settings (#1851)
* Small changes/improvements to the recording settings
* Replaced room warning with info flash
* Added global setting to enable/disable the recording consent feature
* Replace Legal with Terms (#1931)
* Added a more friendly OpenGraph description when invited to join a room (#1932)
* Fixed issue causing maintenance banner not to hide correctly (#1933)
* Hide recording menu and recording list when it is disabled (#1935)
* Hide recording menu and recording list when it is disabled
* Hide recording list when disabled
* GRN2-xx: Added an auto-refresh after 2 mins while waiting for room to start (#1947)
* Added an auto-refresh after 2 mins while waiting for room to start
* Fixed random issue with test case
* GRN2-xx: Added ability to preupload presentations to rooms (#1895)
* Added ability to preupload presentations to rooms (#1868)
* Added setting to site settings and allowed admins to change the presentation
* Added AWS S3 and GCS Storage ENV variables
* Added check to ensure file extension is correct
* Added icon to remove presentation
* Added testcases for preupload
* Add nginx redirect to solve issue with relative root
* Record title, instead of room name, in the popup (#1924)
* Update _public_recording_row.html.erb
* Update _recording_row.html.erb
Co-authored-by: Stefan Weil <sw@weilnetz.de>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: beckerr-rzht <beckerr@hochschule-trier.de>
Co-authored-by: François Ménabé <francois.menabe@unistra.fr>
Co-authored-by: MrKeksi <mrkeksi@users.noreply.github.com>
Co-authored-by: yanosz <yanosz@users.noreply.github.com>
Co-authored-by: Moritz Schlarb <moschlar@metalabs.de>
Co-authored-by: chronikum <34622984+chronikum@users.noreply.github.com>
Co-authored-by: Mitsutaka Sato <miztaka@honestyworks.jp>
Co-authored-by: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
45 lines
1.5 KiB
YAML
45 lines
1.5 KiB
YAML
test:
|
|
service: Disk
|
|
root: <%= Rails.root.join("tmp/storage") %>
|
|
|
|
local:
|
|
service: Disk
|
|
root: <%= Rails.root.join("storage") %>
|
|
|
|
# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
|
|
amazon:
|
|
service: S3
|
|
access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %>
|
|
secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
|
|
region: <%= ENV['AWS_REGION'] %>
|
|
bucket: <%= ENV['AWS_BUCKET'] %>
|
|
|
|
# Remember not to checkin your GCS keyfile to a repository
|
|
google:
|
|
service: GCS
|
|
project: "<%= ENV['GCS_PROJECT'] %>"
|
|
bucket: "<%= ENV['GCS_BUCKET'] %>"
|
|
credentials:
|
|
type: 'service_account'
|
|
project_id: "<%= ENV['GCS_PROJECT_ID'] %>"
|
|
private_key_id: "<%= ENV['GCS_PRIVATE_KEY_ID'] %>"
|
|
private_key: "<%= ENV['GCS_PRIVATE_KEY']&.lines&.join("\\n") %>"
|
|
client_email: "<%= ENV['GCS_CLIENT_EMAIL'] %>"
|
|
client_id: "<%= ENV['GCS_CLIENT_ID'] %>"
|
|
auth_uri: 'https://accounts.google.com/o/oauth2/auth'
|
|
token_uri: 'https://accounts.google.com/o/oauth2/token'
|
|
auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs'
|
|
client_x509_cert_url: "<%= ENV['GCS_CLIENT_CERT'] %>"
|
|
|
|
# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
|
|
# microsoft:
|
|
# service: AzureStorage
|
|
# storage_account_name: your_account_name
|
|
# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
|
|
# container: your_container_name
|
|
|
|
# mirror:
|
|
# service: Mirror
|
|
# primary: local
|
|
# mirrors: [ amazon, google, microsoft ]
|