Merge branch 'release' into staging

.gitignore

@@ -14,7 +14,7 @@ public/stats.json
 /uploads/
 *.jsonl
 /config.conf
-/docker/config.conf
+/docker/config
 .DS_Store
 public/settings.json
 /thumbnails

Dockerfile

@@ -23,13 +23,17 @@ COPY . ./
 
 # Copy default chats, characters and user avatars to <folder>.default folder
 RUN \
-  IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds,settings.json" && \
+  IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds" && \
   \
   echo "*** Store default $RESOURCES in <folder>.default ***" && \
   for R in $RESOURCES; do mv "public/$R" "public/$R.default"; done && \
   \
   echo "*** Create symbolic links to config directory ***" && \
   for R in $RESOURCES; do ln -s "../config/$R" "public/$R"; done && \
+  # rm "config.conf" "public/settings.json" "public/css/bg_load.css" && \
+  ln -s "./config/config.conf" "config.conf" && \
+  ln -s "../config/settings.json" "public/settings.json" && \
+  ln -s "../../config/bg_load.css" "public/css/bg_load.css" && \
   mkdir "config"
 
 # Cleanup unnecessary files

docker/docker-compose.yml

@@ -9,5 +9,4 @@ services:
       - "8000:8000"
     volumes:
       - "./config:/home/node/app/config"
-      - "./config.conf:/home/node/app/config.conf"
     restart: unless-stopped

docker/docker-entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Initialize missing user files
-IFS="," RESOURCES="characters,groups,group chats,chats,User Avatars,worlds,settings.json"
+IFS="," RESOURCES="characters,groups,group chats,chats,User Avatars,worlds"
 for R in $RESOURCES; do
   if [ ! -e "config/$R" ]; then
     echo "Resource not found, copying from defaults: $R"
@@ -9,5 +9,20 @@ for R in $RESOURCES; do
   fi
 done
 
+if [ ! -e "config/config.conf" ]; then
+    echo "Resource not found, copying from defaults: config.conf"
+    cp -r "default/config.conf" "config/config.conf"
+fi
+
+if [ ! -e "config/settings.json" ]; then
+    echo "Resource not found, copying from defaults: settings.json"
+    cp -r "default/settings.json" "config/settings.json"
+fi
+
+if [ ! -e "config/bg_load.css" ]; then
+    echo "Resource not found, copying from defaults: bg_load.css"
+    cp -r "default/bg_load.css" "config/bg_load.css"
+fi
+
 # Start the server
 exec node server.js