Fix nginx.conf; 1.13 supports simultaneous logins on various companies (using paths)

Instead of after the configuration phase; printing it before service start supports debugging better

base/config.sh

@@ -159,10 +159,4 @@ EOF
   fi
 fi
 
-LSMB_CONFIG_FILE=${LSMB_CONFIG_FILE:-./local/conf/ledgersmb.yaml}
-export LSMB_CONFIG_FILE
-echo "--------- LEDGERSMB CONFIGURATION:  $LSMB_CONFIG_FILE"
-cat ${LSMB_CONFIG_FILE}
-echo '--------- LEDGERSMB CONFIGURATION --- END'
-
 exit 0

base/start.sh

@@ -3,4 +3,10 @@
 home_dir="$(dirname $(readlink -f $BASH_SOURCE))"
 "$home_dir/config.sh" || { echo "Failed configuration" ; exit 1 }
 
+LSMB_CONFIG_FILE="${LSMB_CONFIG_FILE:-/srv/ledgersmb/local/conf/ledgersmb.yaml}"
+export LSMB_CONFIG_FILE
+echo "--------- LEDGERSMB CONFIGURATION:  $LSMB_CONFIG_FILE"
+cat "${LSMB_CONFIG_FILE}"
+echo '--------- LEDGERSMB CONFIGURATION --- END'
+
 exec "$home_dir/run.sh"

proxy/nginx.conf

@@ -54,21 +54,23 @@ http {
          return 301 login.pl;
       }
 
-      # JS & CSS
+      location / {
-      location ~* \.(js|css)$ {
+         try_files $uri @strippedprefix @starman;
-         add_header Pragma "public";
-         add_header Cache-Control "public, must-revalidate, proxy-revalidate"; # Production
-         expires     7d; # Indicate that the resource can be cached for 1 week # Production
-         try_files $uri =404;
       }
 
-      location / {
+      location @strippedprefix {
+         rewrite ^/([a-z0-9A-Z]+)/(.*) /$2 break;
+      }
+
+      location @starman {
+         proxy_pass              http://127.0.0.1:5762;
+         proxy_read_timeout      300;
          proxy_set_header        Host $host;
          proxy_set_header        X-Real-IP $remote_addr;
          proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+         proxy_set_header        X-Forwarded-Host $host;
+         proxy_set_header        X-Forwarded-Server $host;
          proxy_set_header        X-Forwarded-Proto $scheme;
-         proxy_read_timeout      300;
-         proxy_pass              http://127.0.0.1:5762;
       }
    }
 }

proxy/scripts/ledgersmb_config/up

@@ -1,3 +1,4 @@
 foreground { echo "Running config..." }
 
+with-contenv
 /usr/local/bin/config.sh

proxy/services/starman/run

@@ -1,3 +1,10 @@
 #!/usr/bin/with-contenv /bin/bash
 
+
+LSMB_CONFIG_FILE="${LSMB_CONFIG_FILE:-/srv/ledgersmb/local/conf/ledgersmb.yaml}"
+export LSMB_CONFIG_FILE
+echo "--------- LEDGERSMB CONFIGURATION:  $LSMB_CONFIG_FILE"
+cat "${LSMB_CONFIG_FILE}"
+echo '--------- LEDGERSMB CONFIGURATION --- END'
+
 s6-setuidgid www-data /usr/local/bin/run.sh