From 24d73e6d90ae59f6c25c5a8b0fb94643e5f4cdfa Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Mon, 22 Aug 2022 23:49:49 -0700 Subject: [PATCH] Pass domain to deploy scripts --- deploy/checkout | 9 +++++---- deploy/setup | 9 +++++---- justfile | 18 ++++++++++-------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/deploy/checkout b/deploy/checkout index 2b2aedf7ae..dd056b0056 100755 --- a/deploy/checkout +++ b/deploy/checkout @@ -2,7 +2,8 @@ set -euxo pipefail -branch=$1 +BRANCH=$1 +DOMAIN=$2 if [[ ! -d ord ]]; then git clone https://github.com/casey/ord.git @@ -11,6 +12,6 @@ fi cd ord git fetch origin -git checkout -B $1 -git reset --hard origin/$1 -./deploy/setup +git checkout -B $BRANCH +git reset --hard origin/$BRANCH +./deploy/setup $DOMAIN diff --git a/deploy/setup b/deploy/setup index 50ca062374..64d0cb2ad7 100755 --- a/deploy/setup +++ b/deploy/setup @@ -6,6 +6,10 @@ touch .hushlogin sed -i -E 's/#?PasswordAuthentication yes/PasswordAuthentication no/' /etc/ssh/sshd_config +DOMAIN=$1 + +hostnamectl set-hostname $DOMAIN + apt-get install --yes \ acl \ clang \ @@ -55,13 +59,10 @@ setfacl -m ord:r /var/lib/bitcoind/signet/.cookie cp deploy/ord.service /etc/systemd/system/ systemctl daemon-reload systemctl stop ord -if [[ -f /var/lib/ord/signet/index.redb ]]; then - mv /var/lib/ord/signet/index.redb /var/lib/ord/signet/index.redb.bak -fi systemctl enable ord systemctl restart ord -while ! curl --fail https://signet.ordinals.com/status; do +while ! curl --fail https://$DOMAIN/status; do echo Waiting for ord… sleep 1 done diff --git a/justfile b/justfile index 86dd9e5803..d828645b57 100644 --- a/justfile +++ b/justfile @@ -20,19 +20,21 @@ watch +args='test': install-dev-deps: cargo install cargo-criterion -deploy branch='master': - ssh root@signet.ordinals.com "mkdir -p deploy \ +deploy branch domain: + ssh root@{{domain}} "mkdir -p deploy \ && apt-get update --yes \ && apt-get upgrade --yes \ && apt-get install --yes git rsync" - rsync -avz deploy/checkout root@signet.ordinals.com:deploy/checkout - ssh root@signet.ordinals.com 'cd deploy && ./checkout {{branch}}' + rsync -avz deploy/checkout root@{{domain}}:deploy/checkout + ssh root@{{domain}} 'cd deploy && ./checkout {{branch}} {{domain}}' -log-ord: - ssh root@signet.ordinals.com 'journalctl -fu ord' +deploy-signet branch="master": (deploy branch "signet.ordinals.com") -log-bitcoind: - ssh root@signet.ordinals.com 'journalctl -fu bitcoind' +log-ord domain: + ssh root@{{domain}} 'journalctl -fu ord' + +log-bitcoind domain: + ssh root@{{domain}} 'journalctl -fu bitcoind' test-deploy: ssh-keygen -f ~/.ssh/known_hosts -R 192.168.56.4