From a75cc150e56e8fa2f1475a5cc9d34dc470a14ff2 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 3 May 2025 07:31:24 -0400 Subject: [PATCH 1/2] Jitsi env updates. --- docker-compose.yml | 224 +++++++++++++++++++++++---------------------- 1 file changed, 113 insertions(+), 111 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b96f629b..9e1b04dd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1584,13 +1584,13 @@ services: environment: GOTIFY_SERVER_PORT: 80 GOTIFY_SERVER_KEEPALIVEPERIODSECONDS: 0 - GOTIFY_SERVER_LISTENADDR: + GOTIFY_SERVER_LISTENADDR: GOTIFY_SERVER_SSL_ENABLED: false GOTIFY_SERVER_SSL_REDIRECTTOHTTPS: true - GOTIFY_SERVER_SSL_LISTENADDR: + GOTIFY_SERVER_SSL_LISTENADDR: GOTIFY_SERVER_SSL_PORT: 443 - GOTIFY_SERVER_SSL_CERTFILE: - GOTIFY_SERVER_SSL_CERTKEY: + GOTIFY_SERVER_SSL_CERTFILE: + GOTIFY_SERVER_SSL_CERTKEY: GOTIFY_SERVER_SSL_LETSENCRYPT_ENABLED: false GOTIFY_SERVER_SSL_LETSENCRYPT_ACCEPTTOS: false GOTIFY_SERVER_SSL_LETSENCRYPT_CACHE: certs @@ -1784,7 +1784,7 @@ services: hugo: command: hugo server --baseURL "it-services.trez.wtf" --bind 0.0.0.0 --appendPort=false --source=/src/it-services --configDir=/src/it-services/config/ -e production --logLevel debug container_name: hugo - image: hugomods/hugo:exts + image: hugomods/hugo:exts-0.145.0 labels: swag: enable swag_proto: http @@ -2136,6 +2136,7 @@ services: SKIN_NAME: ${JITSI__ETHERPAD_SKIN_NAME} SKIN_VARIANTS: ${JITSI__ETHERPAD_SKIN_VARIANTS} SUPPRESS_ERRORS_IN_PAD_TEXT: true + hostname: etherpad.meet.jitsi image: etherpad/etherpad:1.8.6 networks: default: null @@ -2149,50 +2150,50 @@ services: condition: service_started required: true environment: - AUTOSCALER_SIDECAR_KEY_FILE: - AUTOSCALER_SIDECAR_KEY_ID: - AUTOSCALER_SIDECAR_GROUP_NAME: - AUTOSCALER_SIDECAR_HOST_ID: - AUTOSCALER_SIDECAR_INSTANCE_ID: - AUTOSCALER_SIDECAR_PORT: - AUTOSCALER_SIDECAR_REGION: - AUTOSCALER_SIDECAR_SHUTDOWN_POLLING_INTERVAL: - AUTOSCALER_SIDECAR_STATS_POLLING_INTERVAL: - AUTOSCALER_URL: - CHROMIUM_FLAGS: + AUTOSCALER_SIDECAR_KEY_FILE: + AUTOSCALER_SIDECAR_KEY_ID: + AUTOSCALER_SIDECAR_GROUP_NAME: + AUTOSCALER_SIDECAR_HOST_ID: + AUTOSCALER_SIDECAR_INSTANCE_ID: + AUTOSCALER_SIDECAR_PORT: + AUTOSCALER_SIDECAR_REGION: + AUTOSCALER_SIDECAR_SHUTDOWN_POLLING_INTERVAL: + AUTOSCALER_SIDECAR_STATS_POLLING_INTERVAL: + AUTOSCALER_URL: + CHROMIUM_FLAGS: DISPLAY: :0 - ENABLE_STATS_D: - JIBRI_WEBHOOK_SUBSCRIBERS: - JIBRI_HTTP_API_EXTERNAL_PORT: - JIBRI_HTTP_API_INTERNAL_PORT: - JIBRI_RECORDING_RESOLUTION: - JIBRI_RECORDING_VIDEO_ENCODE_PRESET: - JIBRI_RECORDING_CONSTANT_RATE_FACTOR: - JIBRI_RECORDING_FRAMERATE: - JIBRI_RECORDING_QUEUE_SIZE: - JIBRI_RECORDING_STREAMING_MAX_BITRATE: - JIBRI_USAGE_TIMEOUT: - JIBRI_XMPP_USER: + ENABLE_STATS_D: + JIBRI_WEBHOOK_SUBSCRIBERS: + JIBRI_HTTP_API_EXTERNAL_PORT: + JIBRI_HTTP_API_INTERNAL_PORT: + JIBRI_RECORDING_RESOLUTION: + JIBRI_RECORDING_VIDEO_ENCODE_PRESET: + JIBRI_RECORDING_CONSTANT_RATE_FACTOR: + JIBRI_RECORDING_FRAMERATE: + JIBRI_RECORDING_QUEUE_SIZE: + JIBRI_RECORDING_STREAMING_MAX_BITRATE: + JIBRI_USAGE_TIMEOUT: + JIBRI_XMPP_USER: JIBRI_XMPP_PASSWORD: ${JITSI__JIBRI_XMPP_PASSWORD} - JIBRI_BREWERY_MUC: + JIBRI_BREWERY_MUC: JIBRI_RECORDER_USER: jibri-recorder JIBRI_RECORDER_PASSWORD: ${JITSI__JIBRI_RECORDER_PASSWORD} - JIBRI_RECORDING_DIR: - JIBRI_FINALIZE_RECORDING_SCRIPT_PATH: - JIBRI_STRIP_DOMAIN_JID: - JIBRI_STATSD_HOST: - JIBRI_STATSD_PORT: - LOCAL_ADDRESS: + JIBRI_RECORDING_DIR: + JIBRI_FINALIZE_RECORDING_SCRIPT_PATH: + JIBRI_STRIP_DOMAIN_JID: + JIBRI_STATSD_HOST: + JIBRI_STATSD_PORT: + LOCAL_ADDRESS: PUBLIC_URL: ${JITSI__PUBLIC_URL} - TZ: ${JITSI__TZ} - XMPP_AUTH_DOMAIN: + TZ: ${TZ} + XMPP_AUTH_DOMAIN: XMPP_DOMAIN: - XMPP_INTERNAL_MUC_DOMAIN: - XMPP_MUC_DOMAIN: - XMPP_RECORDER_DOMAIN: + XMPP_INTERNAL_MUC_DOMAIN: + XMPP_MUC_DOMAIN: + XMPP_RECORDER_DOMAIN: XMPP_SERVER: - XMPP_PORT: - XMPP_TRUST_ALL_CERTS: + XMPP_PORT: + XMPP_TRUST_ALL_CERTS: image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable} networks: default: null @@ -2205,67 +2206,67 @@ services: bind: create_host_path: true jitsi-jicofo: - container_name: focus.meet.jitsi + container_name: jitsi-jicofo depends_on: jitsi-prosody: condition: service_started required: true environment: - AUTH_TYPE: - BRIDGE_AVG_PARTICIPANT_STRESS: - BRIDGE_STRESS_THRESHOLD: - ENABLE_AUTH: - ENABLE_AUTO_OWNER: - ENABLE_CODEC_VP8: - ENABLE_CODEC_VP9: - ENABLE_CODEC_H264: - ENABLE_CODEC_OPUS_RED: - ENABLE_JVB_XMPP_SERVER: - ENABLE_OCTO: + AUTH_TYPE: + BRIDGE_AVG_PARTICIPANT_STRESS: + BRIDGE_STRESS_THRESHOLD: + ENABLE_AUTH: + ENABLE_AUTO_OWNER: + ENABLE_CODEC_VP8: + ENABLE_CODEC_VP9: + ENABLE_CODEC_H264: + ENABLE_CODEC_OPUS_RED: + ENABLE_JVB_XMPP_SERVER: + ENABLE_OCTO: ENABLE_RECORDING: 1 - ENABLE_SCTP: - ENABLE_AUTO_LOGIN: - JICOFO_AUTH_LIFETIME: + ENABLE_SCTP: + ENABLE_AUTO_LOGIN: + JICOFO_AUTH_LIFETIME: JICOFO_AUTH_PASSWORD: ${JITSI__JICOFO_AUTH_PASSWORD} - JICOFO_AUTH_TYPE: - JICOFO_BRIDGE_REGION_GROUPS: - JICOFO_ENABLE_AUTH: - JICOFO_ENABLE_BRIDGE_HEALTH_CHECKS: - JICOFO_CONF_INITIAL_PARTICIPANT_WAIT_TIMEOUT: - JICOFO_CONF_SINGLE_PARTICIPANT_TIMEOUT: - JICOFO_CONF_SOURCE_SIGNALING_DELAYS: - JICOFO_CONF_MAX_AUDIO_SENDERS: - JICOFO_CONF_MAX_VIDEO_SENDERS: - JICOFO_CONF_STRIP_SIMULCAST: - JICOFO_CONF_SSRC_REWRITING: - JICOFO_ENABLE_HEALTH_CHECKS: - JICOFO_ENABLE_REST: - JICOFO_HEALTH_CHECKS_USE_PRESENCE: - JICOFO_MULTI_STREAM_BACKWARD_COMPAT: - JICOFO_OCTO_REGION: - JIBRI_BREWERY_MUC: - JIBRI_REQUEST_RETRIES: - JIBRI_PENDING_TIMEOUT: - JIGASI_BREWERY_MUC: - JIGASI_SIP_URI: - JVB_BREWERY_MUC: - JVB_XMPP_AUTH_DOMAIN: - JVB_XMPP_INTERNAL_MUC_DOMAIN: - JVB_XMPP_PORT: - JVB_XMPP_SERVER: - MAX_BRIDGE_PARTICIPANTS: - OCTO_BRIDGE_SELECTION_STRATEGY: + JICOFO_AUTH_TYPE: + JICOFO_BRIDGE_REGION_GROUPS: + JICOFO_ENABLE_AUTH: + JICOFO_ENABLE_BRIDGE_HEALTH_CHECKS: + JICOFO_CONF_INITIAL_PARTICIPANT_WAIT_TIMEOUT: + JICOFO_CONF_SINGLE_PARTICIPANT_TIMEOUT: + JICOFO_CONF_SOURCE_SIGNALING_DELAYS: + JICOFO_CONF_MAX_AUDIO_SENDERS: + JICOFO_CONF_MAX_VIDEO_SENDERS: + JICOFO_CONF_STRIP_SIMULCAST: + JICOFO_CONF_SSRC_REWRITING: + JICOFO_ENABLE_HEALTH_CHECKS: + JICOFO_ENABLE_REST: + JICOFO_HEALTH_CHECKS_USE_PRESENCE: + JICOFO_MULTI_STREAM_BACKWARD_COMPAT: + JICOFO_OCTO_REGION: + JIBRI_BREWERY_MUC: + JIBRI_REQUEST_RETRIES: + JIBRI_PENDING_TIMEOUT: + JIGASI_BREWERY_MUC: + JIGASI_SIP_URI: + JVB_BREWERY_MUC: + JVB_XMPP_AUTH_DOMAIN: + JVB_XMPP_INTERNAL_MUC_DOMAIN: + JVB_XMPP_PORT: + JVB_XMPP_SERVER: + MAX_BRIDGE_PARTICIPANTS: + OCTO_BRIDGE_SELECTION_STRATEGY: SENTRY_DSN: "${JICOFO_SENTRY_DSN:-0}" - SENTRY_ENVIRONMENT: - SENTRY_RELEASE: - TZ: ${JITSI__JIGAGI_SIP_SERVER} - XMPP_DOMAIN: - XMPP_AUTH_DOMAIN: - XMPP_INTERNAL_MUC_DOMAIN: - XMPP_MUC_DOMAIN: - XMPP_RECORDER_DOMAIN: - XMPP_SERVER: - XMPP_PORT: + SENTRY_ENVIRONMENT: + SENTRY_RELEASE: + TZ: ${TZ} + XMPP_DOMAIN: + XMPP_AUTH_DOMAIN: + XMPP_INTERNAL_MUC_DOMAIN: + XMPP_MUC_DOMAIN: + XMPP_RECORDER_DOMAIN: + XMPP_SERVER: + XMPP_PORT: image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable} networks: default: null @@ -2326,7 +2327,7 @@ services: SENTRY_DSN: "${JIGASI_SENTRY_DSN:-0}" SENTRY_ENVIRONMENT: SENTRY_RELEASE: - TZ: ${JITSI__TZ} + TZ: ${TZ} image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable} networks: default: null @@ -2357,7 +2358,7 @@ services: ENABLE_COLIBRI_WEBSOCKET: ENABLE_JVB_XMPP_SERVER: ENABLE_OCTO: - JVB_ADVERTISE_IPS: + JVB_ADVERTISE_IPS: 192.168.1.254 JVB_ADVERTISE_PRIVATE_CANDIDATES: JVB_AUTH_USER: JVB_AUTH_PASSWORD: ${JITSI__JVB_AUTH_PASSWORD} @@ -2381,7 +2382,7 @@ services: SENTRY_RELEASE: COLIBRI_REST_ENABLED: SHUTDOWN_REST_ENABLED: - TZ: ${JITSI__JIGAGI_SIP_SERVER} + TZ: ${TZ} XMPP_AUTH_DOMAIN: XMPP_INTERNAL_MUC_DOMAIN: XMPP_SERVER: @@ -2411,7 +2412,7 @@ services: ENABLE_END_CONFERENCE: ENABLE_GUESTS: 1 ENABLE_IPV6: - ENABLE_LOBBY: + ENABLE_LOBBY: 1 ENABLE_RECORDING: 1 ENABLE_XMPP_WEBSOCKET: ENABLE_JAAS_COMPONENTS: @@ -2477,7 +2478,7 @@ services: TURN_PORT: TURNS_PORT: TURN_TRANSPORT: - TZ: ${JITSI__JIGAGI_SIP_SERVER} + TZ: ${TZ} XMPP_DOMAIN: XMPP_AUTH_DOMAIN: XMPP_GUEST_DOMAIN: @@ -2511,7 +2512,7 @@ services: target: /prosody-plugins-custom type: bind jitsi-web: - container_name: meet.jitsi + container_name: jitsi-web environment: AMPLITUDE_ID: ANALYTICS_SCRIPT_URLS: @@ -2540,7 +2541,7 @@ services: DISABLE_AUDIO_LEVELS: DISABLE_DEEP_LINKING: DISABLE_GRANT_MODERATOR: - DISABLE_HTTPS: + DISABLE_HTTPS: 1 DISABLE_KICKOUT: DISABLE_LOCAL_RECORDING: DISABLE_POLLS: @@ -2561,9 +2562,9 @@ services: ENABLE_FILE_RECORDING_SHARING: ENABLE_GUESTS: 1 ENABLE_HSTS: - ENABLE_HTTP_REDIRECT: + ENABLE_HTTP_REDIRECT: 0 ENABLE_IPV6: - ENABLE_LETSENCRYPT: + ENABLE_LETSENCRYPT: 0 ENABLE_LIPSYNC: ENABLE_NO_AUDIO_DETECTION: ENABLE_NOISY_MIC_DETECTION: @@ -2590,7 +2591,7 @@ services: ENABLE_SUBDOMAINS: ENABLE_TALK_WHILE_MUTED: ENABLE_TCC: - ENABLE_TRANSCRIPTIONS: + ENABLE_TRANSCRIPTIONS: 1 ENABLE_XMPP_WEBSOCKET: ENABLE_JAAS_COMPONENTS: ETHERPAD_PUBLIC_URL: @@ -2634,7 +2635,7 @@ services: TOOLBAR_BUTTONS: TRANSLATION_LANGUAGES: TRANSLATION_LANGUAGES_HEAD: - TZ: ${JITSI__JIGAGI_SIP_SERVER} + TZ: ${TZ} USE_APP_LANGUAGE: VIDEOQUALITY_BITRATE_H264_LOW: VIDEOQUALITY_BITRATE_H264_STANDARD: @@ -2656,6 +2657,7 @@ services: XMPP_PORT: WHITEBOARD_ENABLED: WHITEBOARD_COLLAB_SERVER_PUBLIC_URL: + hostname: meet.jitsi image: jitsi/web:${JITSI_IMAGE_VERSION:-stable} labels: swag: enable @@ -4157,7 +4159,7 @@ services: container_name: redlib environment: REDLIB_SFW_ONLY: off - REDLIB_BANNER: + REDLIB_BANNER: REDLIB_ROBOTS_DISABLE_INDEXING: off REDLIB_PUSHSHIFT_FRONTEND: undelete.pullpush.io REDLIB_DEFAULT_THEME: nord @@ -4171,7 +4173,7 @@ services: REDLIB_DEFAULT_USE_HLS: off REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION: off REDLIB_DEFAULT_AUTOPLAY_VIDEOS: off - REDLIB_DEFAULT_SUBSCRIPTIONS: + REDLIB_DEFAULT_SUBSCRIPTIONS: REDLIB_DEFAULT_HIDE_AWARDS: off REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION: off REDLIB_DEFAULT_HIDE_SCORE: off @@ -5118,8 +5120,8 @@ services: watchtower: container_name: watchtower environment: - REPO_PASS: - REPO_USER: + REPO_PASS: + REPO_USER: TZ: America/New_York WATCHTOWER_CLEANUP: true WATCHTOWER_INCLUDE_STOPPED: false @@ -5127,7 +5129,7 @@ services: WATCHTOWER_NOTIFICATIONS: gotify WATCHTOWER_NOTIFICATIONS_LEVEL: info WATCHTOWER_NOTIFICATION_TEMPLATE: '{{range .}}{{.Message}}{{println}}{{end}}' - WATCHTOWER_NOTIFICATION_URL: + WATCHTOWER_NOTIFICATION_URL: WATCHTOWER_SCHEDULE: 0 0 4 * * * WATCHTOWER_TIMEOUT: 30s WATCHTOWER_HTTP_API_METRICS: true From fbbdbb28883ec0075c2e54135993cb3d12d37e3e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 3 May 2025 12:15:07 +0000 Subject: [PATCH 2/2] chore: Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e2a20f0..431dd41a 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ | graylog-datanode | graylog/graylog-datanode:6.1 | | guacamole | flcontainers/guacamole:latest | | homepage | ghcr.io/gethomepage/homepage:latest | -| hugo | hugomods/hugo:exts | +| hugo | hugomods/hugo:exts-0.145.0 | | immich-server | ghcr.io/immich-app/immich-server:release | | immich-machine-learning | ghcr.io/immich-app/immich-machine-learning:release | | immich-pg-db | tensorchord/pgvecto-rs:pg14-v0.2.1 |