updated requirements

This commit is contained in:
tim
2024-07-26 23:34:09 -04:00
parent 9a0d0bc932
commit 497410340f
3 changed files with 19 additions and 13 deletions

View File

@@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
SCRIPT_DIR="$(dirname -- "$( readlink -f -- "$0"; )";)"
CONF_DIR="$SCRIPT_DIR/../conf"
if [ "$1" == "" ]; then if [ "$1" == "" ]; then
echo 'usage: config-push {config_name} [secret_name]' echo 'usage: config-push {config_name} [secret_name]'
exit 1 exit 1
@@ -14,9 +17,9 @@ else
KEY=backend KEY=backend
fi fi
DEXO="conf/dexorder-$CONFIG.toml" DEXO="$CONF_DIR/dexorder-$CONFIG.toml"
if [ ! -f "$DEXO" ]; then if [ ! -f "$DEXO" ]; then
DEXO="conf/$CONFIG/dexorder-$CONFIG.toml" DEXO="$CONF_DIR/$CONFIG/dexorder-$CONFIG.toml"
fi fi
if [ ! -f "$DEXO" ]; then if [ ! -f "$DEXO" ]; then
DEXO= DEXO=
@@ -24,9 +27,9 @@ else
DEXO="--from-file dexorder.toml=$DEXO" DEXO="--from-file dexorder.toml=$DEXO"
fi fi
LOG="conf/logging-$CONFIG.toml" LOG="$CONF_DIR/logging-$CONFIG.toml"
if [ ! -f "$LOG" ]; then if [ ! -f "$LOG" ]; then
LOG="conf/$CONFIG/logging-$CONFIG.toml" LOG="$CONF_DIR/$CONFIG/logging-$CONFIG.toml"
fi fi
if [ ! -f "$LOG" ]; then if [ ! -f "$LOG" ]; then
LOG= LOG=
@@ -34,9 +37,9 @@ else
LOG="--from-file logging.toml=$LOG" LOG="--from-file logging.toml=$LOG"
fi fi
META="conf/metadata-$CONFIG.json" META="$CONF_DIR/metadata-$CONFIG.json"
if [ ! -f "$META" ]; then if [ ! -f "$META" ]; then
META="conf/$CONFIG/metadata-$CONFIG.json" META="$CONF_DIR/$CONFIG/metadata-$CONFIG.json"
fi fi
if [ ! -f "$META" ]; then if [ ! -f "$META" ]; then
META= META=

View File

@@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
SCRIPT_DIR="$(dirname -- "$( readlink -f -- "$0"; )";)"
CONF_DIR="$SCRIPT_DIR/../conf"
if [ "$1" == "" ]; then if [ "$1" == "" ]; then
echo 'usage: secret-push {config_name} [secret_name]' echo 'usage: secret-push {config_name} [secret_name]'
exit 1 exit 1
@@ -9,18 +12,18 @@ CONFIG=$1
shift shift
if [ "$1" != "" ]; then if [ "$1" != "" ]; then
KEY=backend-$1 KEY=backend-secret-$1
else else
KEY=backend KEY=backend-secret
fi fi
FILE="conf/dexorder-$CONFIG.toml" FILE="$CONF_DIR/dexorder-$CONFIG.toml"
if [ ! -f "$FILE" ]; then if [ ! -f "$FILE" ]; then
FILE="conf/$CONFIG/dexorder-$CONFIG.toml" FILE="$CONF_DIR/$CONFIG/dexorder-$CONFIG.toml"
fi fi
if [ ! -f "$FILE" ]; then if [ ! -f "$FILE" ]; then
echo Could not find config file for $1 echo Could not find config file for $CONFIG
exit 1; exit 1;
fi fi

View File

@@ -5,7 +5,7 @@ antlr4-python3-runtime==4.9.3
async-lru==2.0.4 async-lru==2.0.4
attrs==23.2.0 attrs==23.2.0
bitarray==2.9.2 bitarray==2.9.2
cachetools==5.3.3 cachetools==5.4.0
certifi==2024.2.2 certifi==2024.2.2
charset-normalizer==3.3.2 charset-normalizer==3.3.2
ckzg==1.0.1 ckzg==1.0.1
@@ -54,6 +54,6 @@ SQLAlchemy==2.0.31
toolz==0.12.1 toolz==0.12.1
typing_extensions==4.11.0 typing_extensions==4.11.0
urllib3==2.2.1 urllib3==2.2.1
web3==6.20.0 web3==6.20.1
websockets==12.0 websockets==12.0
yarl==1.9.4 yarl==1.9.4