diff --git a/Jenkinsfile b/Jenkinsfile index dcef321..a35f3d2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { CI_WEB='true' CI_PORT='4040' CI_SSL='false' - CI_DELAY='120' + CI_DELAY='600' CI_DOCKERENV='' CI_AUTH='' CI_WEBPATH='' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e47351b..6ba6e27 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -23,7 +23,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='4040' - CI_SSL='false' - - CI_DELAY='120' + - CI_DELAY='600' - CI_DOCKERENV='' - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 78b1347..97abcc8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -34,6 +34,9 @@ param_ports: opt_param_usage_include_env: true opt_param_env_vars: - { env_var: "CONTEXT_PATH", env_value: "url-base", desc: "Base url for use with reverse proxies etc." } + +readonly_supported: true + # application setup block app_setup_block_enabled: true app_setup_block: "While this is a more up to date rebase of the original Booksonic server, upgrading in place is not supported and a fresh install has been recommended. Default user/pass is admin/admin" diff --git a/root/etc/s6-overlay/s6-rc.d/init-booksonic-air-config/run b/root/etc/s6-overlay/s6-rc.d/init-booksonic-air-config/run index d817df7..40aa530 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-booksonic-air-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-booksonic-air-config/run @@ -2,13 +2,14 @@ # shellcheck shell=bash mkdir -p "${BOOKSONIC_AIR_SETTINGS}"/transcode +mkdir -p /run/tomcat.4040 + +lsiown -R abc:abc \ + /config \ + /run/tomcat.4040 if [[ ! -e "${BOOKSONIC_AIR_SETTINGS}"/transcode/ffmpeg ]] || [[ ! -e "${BOOKSONIC_AIR_SETTINGS}"/transcode/flac ]] || [[ ! -e "${BOOKSONIC_AIR_SETTINGS}"/transcode/lame ]]; then ln -sf /usr/bin/ffmpeg "${BOOKSONIC_AIR_SETTINGS}"/transcode/ ln -sf /usr/bin/flac "${BOOKSONIC_AIR_SETTINGS}"/transcode/ ln -sf /usr/bin/lame "${BOOKSONIC_AIR_SETTINGS}"/transcode/ fi - -lsiown -R abc:abc \ - /config \ - "${BOOKSONIC_AIR_HOME}" diff --git a/root/etc/s6-overlay/s6-rc.d/svc-booksonic-air/run b/root/etc/s6-overlay/s6-rc.d/svc-booksonic-air/run index b5f3cb4..b12aa07 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-booksonic-air/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-booksonic-air/run @@ -20,6 +20,7 @@ exec \ -Dairsonic.defaultPodcastFolder=/podcasts \ -Dairsonic.home="${BOOKSONIC_AIR_SETTINGS}" \ -Djava.awt.headless=true \ + -Djava.io.tmpdir="/run/tomcat.4040" \ -Dserver.servlet.contextPath="${URL_BASE}" \ -Dserver.host=0.0.0.0 \ -Dserver.port=4040 \