| {key} | + ))} +
|---|
| {value} | + ))} +
+ Please upload a CSV file with the following columns: name, email, role (Administrator, User, Guest), + verified (true, false), language (de, en, es, ...) +
); }; @@ -78,4 +98,3 @@ function generateRandomFiveDigitNumber() { const max = 99999; return Math.floor(Math.random() * (max - min + 1)) + min; } - diff --git a/config/locales/de.yml b/config/locales/de.yml index 255c739c30..68d3b62274 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -65,6 +65,13 @@ de: get_started: "Um dich zu registrieren, klicken bitte auf diese Schaltfläche." valid_invitation: Die Einladung ist 24 Stunden gültig. sign_up: Registrieren + new_user_signup: + new_user: Neue BigBlueButton Benutzeranmeldung + new_user_description: Ein neuer Benutzer hat sich für die Nutzung von BigBlueButton angemeldet. + name: "Name: %{name}" + email: "E-Mail: %{email}" + admin_panel: "Administrationsbereich" + take_action: "Um den neuen Benutzer zu sehen oder die notwendigen Maßnahmen zu ergreifen, besuchen Sie den Administrationsbereich" reset: password_reset: Passwort zurücksetzen password_reset_requested: "Eine Passwortrücksetzung wurde für %{email} beantragt." @@ -73,4 +80,4 @@ de: link_expires: Der Link wird in 1 Stunde ungültig. ignore_request: "Wenn du dein Passwort nicht ändern wolltest, dann ignoriere bitte diese E-Mail." room: - new_room_name: "%{username}'s Raum" \ No newline at end of file + new_room_name: "%{username}'s Raum" diff --git a/db/schema.rb b/db/schema.rb index 6cacc7bd39..5678e19cdd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -43,6 +43,9 @@ t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true end + create_table "data_migrations", primary_key: "version", id: :string, force: :cascade do |t| + end + create_table "formats", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| t.uuid "recording_id" t.string "recording_type", null: false @@ -192,12 +195,12 @@ t.uuid "role_id" t.string "language", null: false t.string "reset_digest" - t.datetime "reset_sent_at", precision: nil + t.datetime "reset_sent_at" t.boolean "verified", default: false t.string "verification_digest" - t.datetime "verification_sent_at", precision: nil + t.datetime "verification_sent_at" t.string "session_token" - t.datetime "session_expiry", precision: nil + t.datetime "session_expiry" t.integer "status", default: 0 t.index ["email", "provider"], name: "index_users_on_email_and_provider", unique: true t.index ["reset_digest"], name: "index_users_on_reset_digest", unique: true From 583fabf383e4d56e3d0ab9911fd860e49ee713e5 Mon Sep 17 00:00:00 2001 From: Alexander Ungefug <82446024+AlexanderUngefug@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:26:08 +0200 Subject: [PATCH 4/5] Update docker-compose.yml --- docker-compose.yml | 49 ++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 89caf11cff..5768a0f5f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,35 +1,46 @@ version: '3' +volumes: + postgres-data: + redis-data: + + services: - postgres: - image: postgres:14.6-alpine3.17 - container_name: postgres + db: + image: postgres:14.8-alpine + container_name: db restart: unless-stopped + ports: + - 5432:5432 volumes: - - ./data/postgres/14/database_data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD= + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + PGDATA: /var/lib/postgresql/data + POSTGRES_HOST: db redis: - image: redis:6.2-alpine3.17 + image: redis:7.2.4-alpine container_name: redis restart: unless-stopped volumes: - - ./data/redis/database_data:/data + - redis-data:/data - greenlight-v3: - entrypoint: [bin/start] - image: bigbluebutton/greenlight:v3 - container_name: greenlight-v3 + greenlight: + image: my-greenlight-dev + container_name: greenlight restart: unless-stopped - env_file: .env ports: - - 127.0.0.1:5050:3000 - logging: - driver: journald - volumes: - - ./data/greenlight-v3/storage:/usr/src/app/storage + - "3000:3000" + - "587:587" + env_file: + - .env depends_on: - - postgres + - db - redis + logging: + driver: "json-file" + volumes: + - ./app/javascript:/usr/src/app/app/javascript + From c4de7ee574b2a72c00c3d01a970bc5f4fe0d5c6a Mon Sep 17 00:00:00 2001 From: Alexander Ungefug <82446024+AlexanderUngefug@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:26:44 +0200 Subject: [PATCH 5/5] Update sample.env --- sample.env | 109 ++++++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/sample.env b/sample.env index 8473431ec1..ff73aac250 100644 --- a/sample.env +++ b/sample.env @@ -1,100 +1,105 @@ -### SECRET KEY BASE +# ## SECRET KEY BASE # Verifies the integrity of all secrets created in the application # Can be generated by running 'docker run --rm --entrypoint /bin/sh bigbluebutton/greenlight:v3 -c "bundle exec rails secret"' SECRET_KEY_BASE= -### BIGBLUEBUTTON CREDENTIALS +# ## BIGBLUEBUTTON CREDENTIALS # Set these if you are running GreenLight on a single BigBlueButton server. # You can retrieve these by running the following command on your BigBlueButton server: -# bbb-conf --secret +# bbb-conf --secret BIGBLUEBUTTON_ENDPOINT= BIGBLUEBUTTON_SECRET= -### POSTGRES DATABASE URL +# ## POSTGRES DATABASE URL # Must be in the format postgres://username:password@host:port/dbname -# E.g. postgres://postgres:password@postgres:5432/greenlight-v3-production +# E.g. postgres://postgres:password@postgres:5432/greenlight-v3-production DATABASE_URL= -### REDIS CACHE URL +# ## REDIS CACHE URL # Must be in the format redis://host:port -# E.g. redis://redis:6379 +# E.g. redis://redis:6379 REDIS_URL= -### OPTIONAL ENV VARS +# ## OPTIONAL ENV VARS -### SMTP CONFIGURATION +# ## SMTP CONFIGURATION # Emails are required for the basic features of Greenlight to function. # Please refer to your SMTP provider to get the values for the variables below # More information: https://docs.bigbluebutton.org/greenlight/v3/install/#email-setup -#SMTP_SENDER_EMAIL= -#SMTP_SENDER_NAME= -#SMTP_SERVER= -#SMTP_PORT= -#SMTP_DOMAIN= -#SMTP_USERNAME= -#SMTP_PASSWORD= -#SMTP_AUTH= -#SMTP_STARTTLS_AUTO=true -#SMTP_STARTTLS=false -#SMTP_TLS=false -#SMTP_SSL_VERIFY=true - -### EXTERNAL AUTHENTICATION METHODS +# SMTP_SENDER_EMAIL= +# SMTP_SENDER_NAME= +# SMTP_SERVER= +# SMTP_PORT= +# SMTP_DOMAIN= +# SMTP_USERNAME= +# SMTP_PASSWORD= +# SMTP_AUTH= +# SMTP_STARTTLS_AUTO=true +# SMTP_STARTTLS=false +# SMTP_TLS=false +# SMTP_SSL_VERIFY=true + +# ## EXTERNAL AUTHENTICATION METHODS # More information: https://docs.bigbluebutton.org/greenlight/v3/install/#openid-connect-setup -#OPENID_CONNECT_CLIENT_ID= -#OPENID_CONNECT_CLIENT_SECRET= -#OPENID_CONNECT_ISSUER= -#OPENID_CONNECT_REDIRECT= -#OPENID_CONNECT_UID_FIELD=sub +# OPENID_CONNECT_CLIENT_ID= +# OPENID_CONNECT_CLIENT_SECRET= +# OPENID_CONNECT_ISSUER= +# OPENID_CONNECT_REDIRECT= +# OPENID_CONNECT_UID_FIELD=sub # To enable hCaptcha on the user sign up and sign in, define these 2 keys # More information: https://docs.bigbluebutton.org/greenlight/v3/install/#hcaptcha-setup -#HCAPTCHA_SITE_KEY= -#HCAPTCHA_SECRET_KEY= +# HCAPTCHA_SITE_KEY= +# HCAPTCHA_SECRET_KEY= # Set these if you are using a Simple Storage Service (S3) # Uncomment S3_ENDPOINT only if you are using a S3 OTHER than Amazon Web Service (AWS) S3. -#S3_ACCESS_KEY_ID= -#S3_SECRET_ACCESS_KEY= -#S3_REGION= -#S3_BUCKET= -#S3_ENDPOINT= -#S3_FORCE_PATH_STYLE= +# S3_ACCESS_KEY_ID= +# S3_SECRET_ACCESS_KEY= +# S3_REGION= +# S3_BUCKET= +# S3_ENDPOINT= +# S3_FORCE_PATH_STYLE= # Set these environment variables if you are using Google Cloud Storage -#GCS_PROJECT= -#GCS_BUCKET= -#GCS_PROJECT_ID= -#GCS_PRIVATE_KEY_ID= -#GCS_PRIVATE_KEY= -#GCS_CLIENT_EMAIL= -#GCS_CLIENT_ID= -#GCS_CLIENT_CERT= +# GCS_PROJECT= +# GCS_BUCKET= +# GCS_PROJECT_ID= +# GCS_PRIVATE_KEY_ID= +# GCS_PRIVATE_KEY= +# GCS_CLIENT_EMAIL= +# GCS_CLIENT_ID= +# GCS_CLIENT_CERT= # Define the default locale language code (i.e. 'en' for English) from the following list: -# [en, ar, fr, es, fa_IR] +# [en, ar, fr, es, fa_IR] # The DEFAULT_LOCALE setting specifies the default language, overriding the browser language which is always set. # More information: https://docs.bigbluebutton.org/greenlight/v3/install/#default-locale-setup -#DEFAULT_LOCALE=en +# DEFAULT_LOCALE=en # Define the phone number for the voice bridge. # This number is not sent to bbb and is only displayed in the greenlight UI, but it should match the number in the bbb instance to avoid user confusion. -# If this number is defined, each newly created room will be assigned a static voiceBridge pin. -#VOICE_BRIDGE_PHONE_NUMBER= +# If this number is defined, each newly created room will be assigned a static voiceBridge pin. +# VOICE_BRIDGE_PHONE_NUMBER= # Set this if you like to deploy Greenlight on a relative root path other than / # More information: https://docs.bigbluebutton.org/greenlight/v3/install/#relative-url-root-path-subdirectory-setup -#RELATIVE_URL_ROOT=/gl +# RELATIVE_URL_ROOT=/gl -## Define log level in production. +# # Define log level in production. # [debug|info|warn|error|fatal] # Default 'warn'. LOG_LEVEL=info -## Use to send logs to external repository (Optional) +# # Use to send logs to external repository (Optional) # RAILS_LOG_REMOTE_NAME=xxx.papertrailapp.com # RAILS_LOG_REMOTE_PORT=99999 # RAILS_LOG_REMOTE_TAG=greenlight-v3 # Define weather HTML should be used inside ics files generated to share meetings over e-mail clients -#ICS_USE_HTML=true \ No newline at end of file +# ICS_USE_HTML=true + +# # User block by inactivity +# If you want to block users after a certain period of inactivity, you can set the following environment variable. +# The value is in days. +USER_BLOCK_INACTIVITY=25