diff --git a/ansible/files/.env b/ansible/files/.env index a985705..0656cba 100644 --- a/ansible/files/.env +++ b/ansible/files/.env @@ -6,8 +6,9 @@ SQLALCHEMY_DATABASE_URI=postgresql+psycopg://postgres:123456@postgres:5432/petty MODULE_NAME=barker.main PROJECT_NAME=barker MAX_WORKERS=4 -NATS_HOST=nats -NATS_PORT=4222 +NATS_URL=nats://{{ nats_host }}:{{ nats_port }} +SUBJECT="barker.print" +STREAM="barker_print_stream" SECRET_KEY={{ secret_key }} MIDDLEWARE_SECRET_KEY={{ middleware_key }} ALGORITHM=HS256 diff --git a/ansible/files/frank.env b/ansible/files/frank.env index 59ddd5e..2341f1a 100644 --- a/ansible/files/frank.env +++ b/ansible/files/frank.env @@ -1,3 +1,5 @@ -NATS_HOST=localhost -NATS_PORT=4222 -QUEUE_NAME={{ queue_name }} +NATS_URL=nats://localhost:4222 +DURABLE={{ queue_name }} +SUBJECT="barker.print" +STREAM="barker_print_stream" +ADDRESS={{ printer_port }} diff --git a/version_bump.sh b/version_bump.sh index 4eb4d53..0321b8c 100755 --- a/version_bump.sh +++ b/version_bump.sh @@ -3,6 +3,12 @@ set -euo pipefail parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" || exit ; pwd -P ) cd "$parent_path" || exit +last_commit_subject=$(git log -1 --format=%s) +if [[ "$last_commit_subject" =~ ^Version\ Bump ]]; then + echo "Last commit is already a version bump (\"$last_commit_subject\"). Nothing to do." + exit 0 +fi + if [ 1 -eq "$#" ] then current_version=$(grep -m 1 '^version = ' barker/pyproject.toml | sed -E 's/version = "([^"]+)"/\1/')