Просмотр исходного кода

make it easier to run OOS outside docker in SSL mode

Mike 8 месяцев назад
Родитель
Сommit
1fd9199d95
2 измененных файлов с 13 добавлено и 1 удалено
  1. 12 1
      scripts/run_dev.sh
  2. 1 0
      scripts/run_stunnel.sh

+ 12 - 1
scripts/run_dev.sh

@@ -6,7 +6,18 @@
 set -e
 
 SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
-ENV_FILE="$SCRIPT_DIR/../config/settings.env"
+DEFAULT_ENV_FILE="$SCRIPT_DIR/../config/ssl/settings.env"
+
+if [ "$#" -gt 1 ]; then
+  echo "Usage: $0 [path/to/settings.env]"
+  exit 1
+fi
+
+if [ "$#" -eq 1 ]; then
+  ENV_FILE="$1"
+else
+  ENV_FILE="$DEFAULT_ENV_FILE"
+fi
 REPO_ROOT="$SCRIPT_DIR/.."
 
 # Run Open OSCAR Server from repo root.

+ 1 - 0
scripts/run_stunnel.sh

@@ -11,6 +11,7 @@ PEM_PATH="$1"
 
 docker run --rm -it \
   --add-host=host.docker.internal:host-gateway \
+  --add-host=retro-aim-server:host-gateway \
   -v "$PEM_PATH:/etc/stunnel/certs/server.pem:ro" \
   -v "$(pwd)/config/ssl/stunnel.conf:/etc/stunnel/stunnel.conf:ro" \
   -p 443:443 \