diff --git a/.gitignore b/.gitignore index 73559751..bae0fbff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.env .sass-cache/ cmd/geocode-test/geocode-test cmd/passwordgen/passwordgen diff --git a/start-flogo.sh b/start-flogo.sh index 8c6cbdf2..e01f68fd 100755 --- a/start-flogo.sh +++ b/start-flogo.sh @@ -1,9 +1,11 @@ #!/run/current-system/sw/bin/bash -# normal -export $(cat /var/run/secrets/nidus-dev-sync-env | xargs) && BIND=127.0.0.1:9002 FLOGO_BIND=:9001 FLOGO_UPSTREAM=http://127.0.0.1:9001 VERBOSE=1 ../flogo/flogo -target . # MITM proxy -#export $(cat /var/run/secrets/nidus-dev-sync-env | xargs) && BIND=127.0.0.1:9001 FLOGO_BIND=:9000 FLOGO_UPSTREAM=http://127.0.0.1:9001 MITM_PROXY=http://127.0.0.1:8080 ../flogo/flogo -target . -# verbose -#export $(cat /var/run/secrets/nidus-dev-sync-env | xargs) && BIND=127.0.0.1:9001 FLOGO_BIND=:9000 FLOGO_UPSTREAM=http://127.0.0.1:9001 FLOGO_VERBOSE=1 ../flogo/flogo -target . -# no TUI -#export $(cat /var/run/secrets/nidus-dev-sync-env | xargs) && BIND=127.0.0.1:9001 FLOGO_BIND=:9000 FLOGO_DISABLE_TUI=1 FLOGO_UPSTREAM=http://127.0.0.1:9001 ../flogo/flogo -target . +#MITM_PROXY=http://127.0.0.1:8080 +# Flogo verbose +#FLOGO_VERBOSE=1 +# No flogo TUI +#FLOGO_DISABLE_TUI=1 + +export $(cat /var/run/secrets/nidus-dev-sync-env | xargs) && + export $(cat .env | xargs) && \ + ../flogo/flogo -target . diff --git a/start-nidus-sync.sh b/start-nidus-sync.sh index 40a769ed..71686319 100755 --- a/start-nidus-sync.sh +++ b/start-nidus-sync.sh @@ -9,7 +9,9 @@ # export $(cat /var/run/secrets/nidus-dev-sync-env | xargs) && ./nidus-sync -prod 2>&1 | tee nidus-sync.log # # force production environment, but with debug logging - export $(cat /var/run/secrets/nidus-dev-sync-env | xargs) && VERBOSE=1 ./nidus-sync -prod 2>&1 | tee nidus-sync.log + export $(cat /var/run/secrets/nidus-dev-sync-env | xargs) && \ + export $(cat .env | xargs) && \ + ./nidus-sync -prod 2>&1 | tee nidus-sync.log # # Use nix build output, force production environment #export $(cat /var/run/secrets/nidus-dev-sync-env | xargs) && ./result/bin/nidus-sync -prod 2>&1 | tee nidus-sync.log