bump v4 version

docker-compose.yml

@@ -1,12 +1,11 @@
 ---
 ###################################################################   ####  # ##
-# >> DOCKER-COMPOSE-GLFTPD-V3 :: WEBUI
+# >> DOCKER-COMPOSE-GLFTPD-V4 :: WEBUI
 ###################################################################   ####  # ##
 # build args: <see docker-build.sh comments>
 # environment options: <see docker-run.sh comments>
-#
 # uncomment any volumes to mount dirs from host
-# optionally uncomment args e.g. additional ftp ports
+# optionally uncomment build and env args, e.g. additional ftp ports
 ###################################################################   ####  # ##
 
 services:

docker-run.sh

@@ -1,27 +1,30 @@
 #!/bin/bash
-
+VERSION=V4
 ################################## ################################   ####  # ##
-# >> DOCKER-RUN-GLFTPD-V3 :: WEBUI
+# >> DOCKER-RUN-GLFTPD :: WEBUI
 ################################## ################################   ####  # ##
 # ENVIRONMENT VARIABLES:
 #
 # GL_DATA="<path>"                 basedir for gl bind mounts (default=./glftpd)
-#                                  ( to reuse existing install set to /glftpd )
+#                                  gl/bot config and data is stored here
+# GL_DIR="<path>"                  optional path to (existing) gl install
 # WEBUI_LOCAL=1                    run commands on same host, no gl docker [0|1]
 # WEBUI_AUTH_MODE="<mode>"         auth mode [basic|glftpd|both|none]  (basic)
 # NETWORK="<network>"              docker network mode [host|bridge]   (bridge)
 # FORCE=1                          remove any existing container first [0|1]
 #
 # WEBUI_ARGS+= " --any-other-flags "      add any other docker run options
 #
+#  (*) to reuse existing install set GL_DATA to /glftpd
+#
 ###################################################################   ####  # ##
 
 #DEBUG=0
 #GL_DATA="./glftpd"
-#GL_DIR="/glftpd"
 GLFTPD=0
 WEBUI=1
 #WEBUI_LOCAL=1
+#WEBUI_DBUS=0
 #WEBUI_AUTH_MODE="basic"
 #NETWORK="host"
 DOCKER_REGISTRY="ghcr.io/silv3rr"
@@ -80,7 +83,7 @@ else
 fi
 
 echo "----------------------------------------------"
-echo "DOCKER-GLFTPD-RUN-V3"
+echo "DOCKER-GLFTPD-RUN-${VERSION}"
 echo "----------------------------------------------"
 
 # set runtime docker args
@@ -99,7 +102,6 @@ if [ -z "$NETWORK" ]; then
   fi
 fi
 
-
 # local: check for existing glftpd install on host
 if [ "${WEBUI_LOCAL:-0}" -eq 1 ]; then
   if [ -z "$GL_DIR" ]; then

local-install.sh

@@ -278,7 +278,7 @@ for i in assets lib templates; do
     $COPY -u -r "$i" "${WWW_ROOT}/${APPDIR}"
 done
 $MKDIR -v -p "${WWW_ROOT}/${APPDIR}/lib"
-$COPY -u -r -v src/auth "${WWW_ROOT}/${AUTHDIR}"
+$COPY -u -r -v src/auth/* "${WWW_ROOT}/${AUTHDIR}"
 #$COPY -u -r $AUTH_LIBS "${WWW_ROOT}/${AUTHDIR}/lib"
 $COPY -u -r -v README.md docs "${WWW_ROOT}/${APPDIR}/templates"
 if [ ! -s "${WWW_ROOT}${APPDIR}/config.php" ]; then

src/ui/index.php

@@ -42,7 +42,6 @@
 $data = new data;
 
 // TODO: change config with form and or env vars
-
 /* change config, example:
 $config = cfg::load();
 $config = cfg::set($config, 'auth', 'none');