From 3a8983d054f3cef91e819d8a83f85f48b954ad64 Mon Sep 17 00:00:00 2001 From: CEF Server Date: Tue, 18 Mar 2025 23:27:50 +0000 Subject: [PATCH] theme settings --- compile.sh | 14 ++++++++++---- configs/caddy/Caddyfile | 2 +- configure.sh | 4 ++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/compile.sh b/compile.sh index ec48a0d..16b5618 100755 --- a/compile.sh +++ b/compile.sh @@ -12,9 +12,9 @@ function clone { DIRECTORY=$(basename "$1" .git) if [ -d "$DIRECTORY" ]; then pushd "$DIRECTORY" - git pull + git pull --recurse-submodules else - git clone "$1" + git clone --recurse-submodules "$1" declare HASH_$DIRECTORY=0 pushd "$DIRECTORY" fi @@ -58,8 +58,14 @@ taintop grumble docker build -t grumble . taintop mediamtx docker build -t mediamtx . taintop 3M docker build -t 3m . - -taintop CEF docker build -t cef --build-arg "VITE_IRC_WEBSOCKET=$VITE_IRC_WEBSOCKET" --build-arg "VITE_3M_ADDRESS=$VITE_3M_ADDRESS" --build-arg "VITE_HOSTING_ADDRESS=$VITE_HOSTING_ADDRESS" --build-arg "VITE_VOICE_ADDRESS=$VITE_VOICE_ADDRESS" . +taintop CEF docker buildx build -t cef --build-arg "VITE_IRC_WEBSOCKET=$VITE_IRC_WEBSOCKET" \ + --build-arg "VITE_3M_ADDRESS=$VITE_3M_ADDRESS" \ + --build-arg "VITE_HOSTING_ADDRESS=$VITE_HOSTING_ADDRESS" \ + --build-arg "VITE_VOICE_ADDRESS=$VITE_VOICE_ADDRESS" \ + --build-arg "VITE_SITE_NAME_SHORT=$VITE_SITE_NAME_SHORT" \ + --build-arg "VITE_SITE_NAME_LONG=$VITE_SITE_NAME_LONG" \ + --build-arg "VITE_DEFAULT_THEME=$VITE_DEFAULT_THEME" \ + . mkdir -p www rm -rf www/* id=$(docker create cef) diff --git a/configs/caddy/Caddyfile b/configs/caddy/Caddyfile index 3a7db85..46d8a27 100644 --- a/configs/caddy/Caddyfile +++ b/configs/caddy/Caddyfile @@ -49,7 +49,7 @@ @error status 500 404 handle_response @error { root * /srv - try_files /assets/blankIcon.png + try_files /assets/theme-cef/blankIcon.png file_server } } diff --git a/configure.sh b/configure.sh index 24f473c..430fe28 100755 --- a/configure.sh +++ b/configure.sh @@ -64,4 +64,8 @@ envgen ERGO__CEF__IMAGOR__URL "https://$HOST_DOMAIN/embed/" envgen ERGO__CEF__IMAGOR__SECRET "$IMAGOR_SECRET" envgen VITE_VOICE_ADDRESS "wss://$DOMAIN/voice" +envgen VITE_SITE_NAME_SHORT "$ERGO__NETWORK__NAME" +envp VITE_SITE_NAME_LONG "What is the long name of the site?" +envp VITE_DEFAULT_THEME "What theme do you want to use by default? Enter a value from 'assets' without the 'theme-' prefix" + echo "Have you set up Minio? If not, run ./setup-minio.sh"