Skip to content

Commit

Permalink
Follow r/16.x
Browse files Browse the repository at this point in the history
  • Loading branch information
mtneug committed May 15, 2024
1 parent dbf67d1 commit 7d096ca
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ WORKDIR "${OPENCAST_SRC}"
RUN git clone --recursive "${OPENCAST_REPO}" . \
&& git checkout "${OPENCAST_VERSION}" \
&& sed -i "s#https://mvn.opencast.org/#https://radosgw.public.os.wwu.de/mvn.opencast.org/#" pom.xml
RUN mvn --batch-mode install \
RUN ./mvnw --batch-mode install \
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-DskipTests=true \
Expand Down
2 changes: 1 addition & 1 deletion VERSION_OPENCAST
Original file line number Diff line number Diff line change
@@ -1 +1 @@
develop
r/16.x
2 changes: 1 addition & 1 deletion rootfs-build/usr/local/bin/oc_build
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ fi

cd "${OPENCAST_SRC}"
# shellcheck disable=SC2086
mvn install $opts
./mvnw install $opts

log "oc_build" "End building Opencast"
2 changes: 1 addition & 1 deletion rootfs/opencast/etc/custom.properties
Original file line number Diff line number Diff line change
Expand Up @@ -354,5 +354,5 @@ karaf.pid.file=${karaf.data}/pid
# distributed artifacts on the downloads and streaming servers, all of which are protected by verification components.
# Default is 60 seconds as it shouldn't take longer than that to make a request to a server. This will have no impact on
# a system where url signing is not configured. For more information please see:
# http://docs.opencast.org/develop/admin/configuration/stream-security/#configuration-of-url-signing-timeout-values
# 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
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,19 @@ prop.org.opencastproject.admin.mediamodule.url=${prop.org.opencastproject.engage
#
#prop.org.opencastproject.admin.feedback.url=

# Link to the Engage UI.
# Flag to display imprint and privacy in admin-UIs footer
#
# Value: <a complete url with scheme and port>
# Default: ${org.opencastproject.server.url}
# Value: <boolean>
# Default: false
#
prop.org.opencastproject.engage.ui.url={{PROP_ORG_OPENCASTPROJECT_ENGAGE_UI_URL}}
prop.org.opencastproject.admin.display_about=false

# Link to the RSS and atom feed base
# Link to the Engage UI.
#
# Value: <a complete url with scheme and port>
# Default: ${org.opencastproject.server.url}
#
#prop.org.opencastproject.feed.url=http://localhost:8080
prop.org.opencastproject.engage.ui.url={{PROP_ORG_OPENCASTPROJECT_ENGAGE_UI_URL}}

# Link to the External API
#
Expand Down Expand Up @@ -178,7 +178,6 @@ prop.adminui.user.external_role_display=false
# Path to the default video player used by the engage interfaces and the LTI tools. Parameters for selecting the
# specific videos will be appended automatically. Common values include:
#
# - paella player 6: /paella/ui/watch.html?id=#{id} ← requires plugin
# - paella player 7: /paella7/ui/watch.html?id=#{id}
#
# Default: /paella7/ui/watch.html?id=#{id}
Expand Down

0 comments on commit 7d096ca

Please sign in to comment.