diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 70e5dac..55b4991 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -27,24 +27,24 @@ jobs: opencast_version: 'master' push_major: 'false' - day_of_week: '1' - opencast_version: '16.7' + opencast_version: '17.0' push_major: 'true' - day_of_week: '2' - opencast_version: '16.6' + opencast_version: '17.0' push_major: 'false' - day_of_week: '3' - opencast_version: '16.5' + opencast_version: '17.0' push_major: 'false' # legacy - day_of_week: '4' - opencast_version: '15.12' + opencast_version: '16.7' push_major: 'true' - day_of_week: '5' - opencast_version: '15.11' + opencast_version: '16.6' push_major: 'false' - day_of_week: '6' - opencast_version: '15.10' + opencast_version: '16.5' push_major: 'false' steps: diff --git a/Dockerfile b/Dockerfile index 7627f03..814f29a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,6 +112,8 @@ RUN groupadd --system -g "${OPENCAST_GID}" "${OPENCAST_GROUP}" \ && mkdir -p "${OPENCAST_DATA}" "${OPENCAST_UHOME}" "${WHISPER_CPP_MODELS}" \ && chown -R "${OPENCAST_USER}:${OPENCAST_GROUP}" "${OPENCAST_DATA}" "${OPENCAST_UHOME}" "${WHISPER_CPP_MODELS}" +# libgomp1 is a dependency of whisper.cpp. It is also installed as a dependency of Tesseract, but we want it to be an +# explicitly installed package. RUN apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ @@ -124,6 +126,7 @@ RUN apt-get update \ gosu \ inotify-tools \ jq \ + libgomp1 \ netcat-openbsd \ openssl \ rsync \ diff --git a/Dockerfile-build b/Dockerfile-build index 21deb0d..d678c06 100644 --- a/Dockerfile-build +++ b/Dockerfile-build @@ -109,6 +109,8 @@ Pin: release o=Ubuntu Pin-Priority: -1 EOF +# libgomp1 is a dependency of whisper.cpp. It is also installed as a dependency of Tesseract, but we want it to be an +# explicitly installed package. RUN apt-get update \ && apt-get install -y --no-install-recommends \ gnupg \ @@ -140,6 +142,7 @@ RUN apt-get update \ gosu \ inotify-tools \ jq \ + libgomp1 \ netcat-openbsd \ openssl \ rsync \ @@ -149,6 +152,9 @@ RUN apt-get update \ \ && sudo ln -s /usr/local/openjdk*/bin/* /usr/local/bin/ \ \ + && deluser "$(id -nu 1000)" \ + && rm -rf /home/ubuntu \ + \ && groupadd --system -g "${OPENCAST_GID}" "${OPENCAST_GROUP}" \ && useradd --system -M -N -g "${OPENCAST_GROUP}" -d "${OPENCAST_UHOME}" -u "${OPENCAST_UID}" "${OPENCAST_USER}" \ && mkdir -p "${OPENCAST_SRC}" "${OPENCAST_HOME}" "${OPENCAST_UHOME}" "${OPENCAST_DATA}" "${OPENCAST_BUILD_ASSETS}" "${WHISPER_CPP_MODELS}" \ diff --git a/README.md b/README.md index 69083b0..fe252b6 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ In the `./docker-compose` directory there are also compose files for more produc ## Images -Opencast comes in different distributions. For each of the official distributions, there is a specific container image. Each version is tagged. For example, the full image name containing the `admin` distribution at version `16.7` is `quay.io/opencast/admin:16.7`. Leaving the version out will install the latest one. +Opencast comes in different distributions. For each of the official distributions, there is a specific container image. Each version is tagged. For example, the full image name containing the `admin` distribution at version `17.0` is `quay.io/opencast/admin:17.0`. Leaving the version out will install the latest one. ### `allinone` @@ -120,13 +120,15 @@ Usage: ## Configuration -It's recommended to configure Opencast by using [Docker Volumes](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems): +It's recommended to configure Opencast by using [Docker Volumes](https://docs.docker.com/engine/containers/run/#filesystem-mounts): ```sh $ docker run -v "/path/to/opencast-etc:/etc/opencast" quay.io/opencast/ ``` -The most important settings, however, can be configured by [environment variables](https://docs.docker.com/engine/reference/run/#env-environment-variables). You can use this functionally to generate new configuration files. For this start a new container with specific variables and execute the `app:init` command. This will ensure you haven't missed anything, write the configuration files and exit. Then you can copy the files to a target directory: +Note that `/path/to/opencast-etc` only needs to contain configuration files you changed. During startup, those will be complement with the additional default configuration files. + +The most important settings can also be configured with [environment variables](https://docs.docker.com/engine/containers/run/#environment-variables). You can use this functionally to generate new configuration files. For this, start a new container with specific variables and execute the `app:init` command. This will ensure you haven't missed anything, write the configuration files and exit. Then you can copy the files to a target directory: ```sh $ docker run --name opencast_generate_config \ diff --git a/VERSION b/VERSION index 270c4d9..03b6389 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.7 +17.0 diff --git a/VERSION_FFMPEG b/VERSION_FFMPEG index 9fe9ff9..a8907c0 100644 --- a/VERSION_FFMPEG +++ b/VERSION_FFMPEG @@ -1 +1 @@ -7.0.1 +7.0.2 diff --git a/VERSION_MAJOR b/VERSION_MAJOR index b6a7d89..98d9bcb 100644 --- a/VERSION_MAJOR +++ b/VERSION_MAJOR @@ -1 +1 @@ -16 +17 diff --git a/VERSION_OPENCAST b/VERSION_OPENCAST index 270c4d9..03b6389 100644 --- a/VERSION_OPENCAST +++ b/VERSION_OPENCAST @@ -1 +1 @@ -16.7 +17.0 diff --git a/VERSION_WHISPER_CPP b/VERSION_WHISPER_CPP index d4f6e2c..3b34d22 100644 --- a/VERSION_WHISPER_CPP +++ b/VERSION_WHISPER_CPP @@ -1 +1 @@ -v1.6.2 +v1.7.2 diff --git a/docker-compose/docker-compose.allinone.h2+pyca.yml b/docker-compose/docker-compose.allinone.h2+pyca.yml index 5b0c819..286fefa 100644 --- a/docker-compose/docker-compose.allinone.h2+pyca.yml +++ b/docker-compose/docker-compose.allinone.h2+pyca.yml @@ -19,7 +19,11 @@ volumes: services: opensearch: - image: opensearchproject/opensearch:1 + image: opencast/opensearch:1 + build: + dockerfile_inline: | + FROM docker.io/opensearchproject/opensearch:1 + RUN bin/opensearch-plugin install analysis-icu environment: discovery.type: single-node bootstrap.memory_lock: 'true' @@ -30,7 +34,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:16.7 + image: quay.io/opencast/allinone:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static diff --git a/docker-compose/docker-compose.allinone.h2.yml b/docker-compose/docker-compose.allinone.h2.yml index dd1f047..ea145c7 100644 --- a/docker-compose/docker-compose.allinone.h2.yml +++ b/docker-compose/docker-compose.allinone.h2.yml @@ -18,7 +18,11 @@ volumes: services: opensearch: - image: opensearchproject/opensearch:1 + image: opencast/opensearch:1 + build: + dockerfile_inline: | + FROM docker.io/opensearchproject/opensearch:1 + RUN bin/opensearch-plugin install analysis-icu environment: discovery.type: single-node bootstrap.memory_lock: 'true' @@ -29,7 +33,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:16.7 + image: quay.io/opencast/allinone:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://localhost:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static diff --git a/docker-compose/docker-compose.allinone.mariadb.yml b/docker-compose/docker-compose.allinone.mariadb.yml index 897dd3c..803b104 100644 --- a/docker-compose/docker-compose.allinone.mariadb.yml +++ b/docker-compose/docker-compose.allinone.mariadb.yml @@ -19,7 +19,7 @@ volumes: services: mariadb: - image: mariadb:10.5 + image: docker.io/library/mariadb:10.5 environment: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: opencast @@ -30,7 +30,11 @@ services: - db:/var/lib/mysql opensearch: - image: opensearchproject/opensearch:1 + image: opencast/opensearch:1 + build: + dockerfile_inline: | + FROM docker.io/opensearchproject/opensearch:1 + RUN bin/opensearch-plugin install analysis-icu environment: discovery.type: single-node bootstrap.memory_lock: 'true' @@ -41,7 +45,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:16.7 + image: quay.io/opencast/allinone:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://localhost:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static diff --git a/docker-compose/docker-compose.allinone.postgres.yml b/docker-compose/docker-compose.allinone.postgres.yml index 7f4a676..2baa83d 100644 --- a/docker-compose/docker-compose.allinone.postgres.yml +++ b/docker-compose/docker-compose.allinone.postgres.yml @@ -19,7 +19,7 @@ volumes: services: postgresql: - image: postgres:13-alpine + image: docker.io/library/postgres:13-alpine environment: POSTGRES_DB: opencast POSTGRES_USER: opencast @@ -28,7 +28,11 @@ services: - db:/var/lib/postgresql/data opensearch: - image: opensearchproject/opensearch:1 + image: opencast/opensearch:1 + build: + dockerfile_inline: | + FROM docker.io/opensearchproject/opensearch:1 + RUN bin/opensearch-plugin install analysis-icu environment: discovery.type: single-node bootstrap.memory_lock: 'true' @@ -39,7 +43,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/allinone:16.7 + image: quay.io/opencast/allinone:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://localhost:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8080/static diff --git a/docker-compose/docker-compose.build.yml b/docker-compose/docker-compose.build.yml index 8548c2e..9857cd6 100644 --- a/docker-compose/docker-compose.build.yml +++ b/docker-compose/docker-compose.build.yml @@ -18,7 +18,11 @@ volumes: services: opensearch: - image: opensearchproject/opensearch:1 + image: opencast/opensearch:1 + build: + dockerfile_inline: | + FROM docker.io/opensearchproject/opensearch:1 + RUN bin/opensearch-plugin install analysis-icu environment: discovery.type: single-node bootstrap.memory_lock: 'true' @@ -29,7 +33,7 @@ services: - opensearch:/usr/share/opensearch/data opencast: - image: quay.io/opencast/build:16.7 + image: quay.io/opencast/build:17.0 tty: true stdin_open: true environment: diff --git a/docker-compose/docker-compose.multiserver.build.yml b/docker-compose/docker-compose.multiserver.build.yml index 48ddca9..25f2b76 100644 --- a/docker-compose/docker-compose.multiserver.build.yml +++ b/docker-compose/docker-compose.multiserver.build.yml @@ -19,7 +19,7 @@ volumes: services: mariadb: - image: mariadb:10.5 + image: docker.io/library/mariadb:10.5 environment: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: opencast @@ -30,7 +30,11 @@ services: - db:/var/lib/mysql opensearch: - image: opensearchproject/opensearch:1 + image: opencast/opensearch:1 + build: + dockerfile_inline: | + FROM docker.io/opensearchproject/opensearch:1 + RUN bin/opensearch-plugin install analysis-icu environment: discovery.type: single-node bootstrap.memory_lock: 'true' @@ -41,7 +45,7 @@ services: - opensearch:/usr/share/opensearch/data opencast-admin: - image: quay.io/opencast/build:16.7 + image: quay.io/opencast/build:17.0 tty: true stdin_open: true environment: @@ -69,7 +73,7 @@ services: - "${OPENCAST_SRC}:/usr/src/opencast" opencast-presentation: - image: quay.io/opencast/build:16.7 + image: quay.io/opencast/build:17.0 tty: true stdin_open: true environment: @@ -96,7 +100,7 @@ services: - "${OPENCAST_SRC}:/usr/src/opencast" opencast-worker: - image: quay.io/opencast/build:16.7 + image: quay.io/opencast/build:17.0 tty: true stdin_open: true environment: diff --git a/docker-compose/docker-compose.multiserver.mariadb.yml b/docker-compose/docker-compose.multiserver.mariadb.yml index ce7d716..d0dbcdf 100644 --- a/docker-compose/docker-compose.multiserver.mariadb.yml +++ b/docker-compose/docker-compose.multiserver.mariadb.yml @@ -19,7 +19,7 @@ volumes: services: mariadb: - image: mariadb:10.5 + image: docker.io/library/mariadb:10.5 environment: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: opencast @@ -30,7 +30,11 @@ services: - db:/var/lib/mysql opensearch: - image: opensearchproject/opensearch:1 + image: opencast/opensearch:1 + build: + dockerfile_inline: | + FROM docker.io/opensearchproject/opensearch:1 + RUN bin/opensearch-plugin install analysis-icu environment: discovery.type: single-node bootstrap.memory_lock: 'true' @@ -41,7 +45,7 @@ services: - opensearch:/usr/share/opensearch/data opencast-admin: - image: quay.io/opencast/admin:16.7 + image: quay.io/opencast/admin:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-admin:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -62,7 +66,7 @@ services: - data:/data opencast-presentation: - image: quay.io/opencast/presentation:16.7 + image: quay.io/opencast/presentation:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-presentation:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -82,7 +86,7 @@ services: - data:/data opencast-worker: - image: quay.io/opencast/worker:16.7 + image: quay.io/opencast/worker:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-worker:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static diff --git a/docker-compose/docker-compose.multiserver.postgres.yml b/docker-compose/docker-compose.multiserver.postgres.yml index c3ec26a..64afd21 100644 --- a/docker-compose/docker-compose.multiserver.postgres.yml +++ b/docker-compose/docker-compose.multiserver.postgres.yml @@ -19,7 +19,7 @@ volumes: services: postgresql: - image: postgres:13-alpine + image: docker.io/library/postgres:13-alpine environment: POSTGRES_DB: opencast POSTGRES_USER: opencast @@ -28,7 +28,11 @@ services: - db:/var/lib/postgresql/data opensearch: - image: opensearchproject/opensearch:1 + image: opencast/opensearch:1 + build: + dockerfile_inline: | + FROM docker.io/opensearchproject/opensearch:1 + RUN bin/opensearch-plugin install analysis-icu environment: discovery.type: single-node bootstrap.memory_lock: 'true' @@ -39,7 +43,7 @@ services: - opensearch:/usr/share/opensearch/data opencast-admin: - image: quay.io/opencast/admin:16.7 + image: quay.io/opencast/admin:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-admin:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -60,7 +64,7 @@ services: - data:/data opencast-presentation: - image: quay.io/opencast/presentation:16.7 + image: quay.io/opencast/presentation:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-presentation:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static @@ -80,7 +84,7 @@ services: - data:/data opencast-worker: - image: quay.io/opencast/worker:16.7 + image: quay.io/opencast/worker:17.0 environment: ORG_OPENCASTPROJECT_SERVER_URL: http://opencast-worker:8080 ORG_OPENCASTPROJECT_DOWNLOAD_URL: http://localhost:8081/static diff --git a/rootfs/opencast/etc/custom.properties b/rootfs/opencast/etc/custom.properties index e3cb884..7d485fc 100644 --- a/rootfs/opencast/etc/custom.properties +++ b/rootfs/opencast/etc/custom.properties @@ -347,3 +347,17 @@ karaf.pid.file=${karaf.data}/pid # a system where url signing is not configured. For more information please see: # https://docs.opencast.org/develop/admin/#configuration/stream-security/stream-security-config/#configuration-of-url-signing-timeout-values #org.opencastproject.security.internal.url.signing.duration=60 + +# Allow episode ID based access control via roles. +# If activated, users with a role like ROLE_EPISODE__ will have access to the episode with the given +# identifier, without this having to be explicitly stated in the ACL attached to the episode. +# +# For example, ROLE_EPISODE_872dc4ec-ca8a-4e12-8dac-ce99784d6d29_READ will allow the user to get read access to episode +# 872dc4ec-ca8a-4e12-8dac-ce99784d6d29. +# +# To make this work for the Admin UI and External API, the Elasticsearch index needs to be updated with modified +# ACLs. You can achieve this by calling the /index/rebuild/AssetManager/ACL endpoint AFTER activating this feature. +# The endpoint will reindex only event ACLs. +# +# Default: false +#org.opencastproject.episode.id.role.access = false diff --git a/rootfs/opencast/etc/org.opencastproject.organization-mh_default_org.cfg-clustered b/rootfs/opencast/etc/org.opencastproject.organization-mh_default_org.cfg-clustered index 5590285..6e15357 100644 --- a/rootfs/opencast/etc/org.opencastproject.organization-mh_default_org.cfg-clustered +++ b/rootfs/opencast/etc/org.opencastproject.organization-mh_default_org.cfg-clustered @@ -122,11 +122,10 @@ prop.org.opencastproject.admin.help.restdocs.url=/rest_docs.html # Default: undefined prop.org.opencastproject.admin.mediamodule.url=${prop.org.opencastproject.engage.ui.url}/engage/ui -# Link to a JIRA feedback widget collector. +# Link to a feedback collector page. # -# If the property is specified, the feedback button in the lower right corner will -# link to the widget and allow to create issues right inside the project. If the -# property is not specified, the feedback button will be hidden. +# If the property is specified, a feedback button will appear in the lower right corner of the admin UI, linking +# to the given URL. If it is not specified, no feedback button will be shown. # # Value: # @@ -139,6 +138,12 @@ prop.org.opencastproject.admin.mediamodule.url=${prop.org.opencastproject.engage # #prop.org.opencastproject.admin.display_about=false +# Flag to display terms of use in admin UI +# Value: +# Default: false +# +#prop.org.opencastproject.admin.display_terms=false + # Link to the Engage UI. # # Value: @@ -176,201 +181,10 @@ prop.org.opencastproject.engage.ui.url={{PROP_ORG_OPENCASTPROJECT_ENGAGE_UI_URL} # Enable themes in the admin interface. # Format: boolean -# Default: true -prop.admin.themes.enabled=false +# Default: false +#prop.admin.themes.enabled=false # Enable the sttatistics views in the admin intterface. # Format: boolean # Default: false #prop.admin.statistics.enabled=false - - -### -# ⚠️ Settings specific to the old admin interface -# These settings are deprecated and will likely be removed with Opencast 17 -# ## - -# Set a flag to display External Roles on User modal -# -# Value: -# Default: false -prop.adminui.user.external_role_display=false - -# Name of the list to provide a user listing as used in the group editor of the admin ui. -# -# Values: -# - USERS.NAME will list users by name (e.g. "John Sample") -# - USERS.NAME.AND.EMAIL will list users by name and email (e.g. "John Sample ") -# - USERS.NAME.AND.USERNAME will list users by name and username (e.g. "John Sample (jsample)") -# Default: USERS.NAME.AND.USERNAME -#prop.adminui.user.listname=USERS.NAME.AND.USERNAME - -# Shortcut definitions for admin UI video player -# Format: prop.admin.shortcut.player= -prop.admin.shortcut.player.play_pause=space -prop.admin.shortcut.player.previous_frame=left -prop.admin.shortcut.player.next_frame=right -prop.admin.shortcut.player.previous_segment=up -prop.admin.shortcut.player.next_segment=down -prop.admin.shortcut.player.step_backward=ctrl+left -prop.admin.shortcut.player.step_forward=ctrl+right -prop.admin.shortcut.player.volume_up=plus -prop.admin.shortcut.player.volume_down=- -prop.admin.shortcut.player.mute=m - -# Shortcut definitions for admin UI video editor -# Format: prop.admin.shortcut.editor.= -prop.admin.shortcut.editor.split_at_current_time=v -prop.admin.shortcut.editor.cut_selected_segment=backspace -prop.admin.shortcut.editor.play_current_segment=c -prop.admin.shortcut.editor.play_current_segment_with_pre-roll=C -prop.admin.shortcut.editor.play_ending_of_current_segment=n -prop.admin.shortcut.editor.clear_list=ctrl+backspace - -# Shortcut definitions for admin UI video editor -# Format: prop.admin.shortcut.general.= -prop.admin.shortcut.general.new_event=n -prop.admin.shortcut.general.new_series=N -prop.admin.shortcut.general.event_view=e -prop.admin.shortcut.general.series_view=s -prop.admin.shortcut.general.remove_filters=r -prop.admin.shortcut.general.select_next_dashboard_filter=f -prop.admin.shortcut.general.select_previous_dashboard_filter=F -prop.admin.shortcut.general.main_menu=m - -# Shortcut definitions for admin UI add-event and add-series modals -# Format: prop.admin.shortcut.add_media.= -prop.admin.shortcut.add_media.next_tab=shift+alt+right -prop.admin.shortcut.add_media.previous_tab=shift+alt+left - -# Default values for fields in the tab Source of the Add Event wizard -# -# Automatically populates fields in the tab Source of the Add Event wizard. -# The fields populated are 'Start Date', 'Start Time', 'End Time' and 'Duration' which are set as follows: -# -# Start Date: Current day if the calculated timeslot is earlier than the cutoff time for the day, or the next day, -# i.e. today if possible, otherwise tomorrow. -# Start Time: Current time rounded up to the next available timeslot, or the first available timeslot on the next day. -# Duration: The default duration of events -# End Time: Start Time + Duration (implicit end date may be on next day) - -# Start time of first timeslot in the day -# Format: HH:mm -# Default: 08:00 -#prop.admin.event.new.start_time=08:00 - -# Cut-off time for recordings in the day -# Format: HH:mm -# Default: 20:00 -#prop.admin.event.new.end_time=20:00 - -# Duration of event recording in minutes -# Default: 55 -#prop.admin.event.new.duration=55 - -# Interval between recording start times in minutes -# Default: 60 -#prop.admin.event.new.interval=60 - -# Note: prop.admin.event.new.duration need not match prop.admin.event.new.interval; -# this is to allow short intermissions between consecutive events. - -# Preselect an appropriate weekday when scheduling multiple events. -# -# Format: Boolean -# Default: true -# -#prop.admin.event.new.preselect_day=true - -# -# Display durations for different notification types in SECONDS. -# -# If you specify the value -1 the notification will remain until manually closed by the user. - -# Display duration for notification type error -# -# Format: A integer or -1 -# Default: -1 -# -#prop.admin.notification.duration.error=-1 - -# Display duration for notification type success -# -# Format: A integer or -1 -# Default: 5 -# -#prop.admin.notification.duration.success=5 - -# Display duration for notification type warning -# -# Format: A integer or -1 -# Default: 5 -# -#prop.admin.notification.duration.warning=5 - -# Display position for global notifications -# -# Possible positions are: -# - top-right -# - top-left -# - top-center -# - bottom-right -# - bottom-left -# - bottom-center -# -# Default: bottom-right -# -#prop.admin.notification.position.global=bottom-right - -# If the preview mode in the video editor is enabled per default. -# -# Format: Boolean -# Default: true -# -#prop.admin.editor.previewmode.default=true - -# Event access control update mode when modifying series permissions. -# Possible modes are: -# - always: When modifying series permissions, automatically remove all permission rules specific to single episodes -# belonging to the series. This enforces every episode has the rules of the series in effect as soon as they -# are changed. -# - never: Only update the series permissions but never replace permissions set on event level. This can mean that -# updated rules have no effect on already existing events. -# - optional: Like `never` but present users with a button in the series permission dialog which allows them to -# replace the event specific permissions if they want to. -# Default: optional -#prop.admin.series.acl.event.update.mode=optional - -# Default values for trim segment in the editor. -# Default: In milliseconds -# -# start_length: Length of trim segment at the beginning of each video. -# end_length: Length of trim segment at the end of each video. -# minimum_length: The minimum length of any one segment at any point in the video. - -# Length of trim segment at the beginning of each video. -# -# Format: An integer -# Default: 0 -#prop.admin.editor.segment.start_length=3000 - -# Length of trim segment at the end of each video. -# -# Format: An integer -# Default: 0 -#prop.admin.editor.segment.end_length=3000 - -# The minimum length of any one segment. -# -# Format: An integer -# Default: 0 -#prop.admin.editor.segment.minimum_length=1000 - -# The location of the video editor linked in the admin interface -# -# Format: A URL or path -# Common values: -# The internal editor: #!/events/events/$id/tools/editor -# The external editing tool: /editor-ui/index.html?id=$id -# Default: /editor-ui/index.html?id=$id -#prop.admin.editor.url=/editor-ui/index.html?id=$id diff --git a/rootfs/opencast/etc/org.ops4j.pax.logging.cfg b/rootfs/opencast/etc/org.ops4j.pax.logging.cfg index 1fdcf93..0aa766a 100644 --- a/rootfs/opencast/etc/org.ops4j.pax.logging.cfg +++ b/rootfs/opencast/etc/org.ops4j.pax.logging.cfg @@ -37,7 +37,7 @@ log4j2.logger.cxf.level = WARN # Appenders configuration -# Console appender used for Docker +# Console appender used in containers log4j2.appender.console.type = Console log4j2.appender.console.name = Console log4j2.appender.console.layout.type = PatternLayout