migrate to hantim org and consolidate deploy secret name
Deploy timothykim.net / deploy (push) Failing after 3s
Deploy timothykim.net / deploy (push) Failing after 3s
- Update all references from timothykim/ to hantim/ org - Rename DEPLOY_KEY to DEPLOY_SSH_KEY everywhere - Update README to reference org-level secrets
This commit is contained in:
@@ -13,6 +13,6 @@ jobs:
|
|||||||
- name: Deploy via SSH
|
- name: Deploy via SSH
|
||||||
run: |
|
run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/deploy_key
|
echo "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/deploy_key
|
||||||
chmod 600 ~/.ssh/deploy_key
|
chmod 600 ~/.ssh/deploy_key
|
||||||
ssh -o StrictHostKeyChecking=accept-new -i ~/.ssh/deploy_key deploy@${{ secrets.DEPLOY_HOST }} deploy-nginx
|
ssh -o StrictHostKeyChecking=accept-new -i ~/.ssh/deploy_key deploy@${{ secrets.DEPLOY_HOST }} deploy-nginx
|
||||||
|
|||||||
@@ -13,6 +13,6 @@ jobs:
|
|||||||
- name: Deploy via SSH
|
- name: Deploy via SSH
|
||||||
run: |
|
run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/deploy_key
|
echo "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/deploy_key
|
||||||
chmod 600 ~/.ssh/deploy_key
|
chmod 600 ~/.ssh/deploy_key
|
||||||
ssh -o StrictHostKeyChecking=accept-new -i ~/.ssh/deploy_key deploy@${{ secrets.DEPLOY_HOST }} deploy-timothykim.net
|
ssh -o StrictHostKeyChecking=accept-new -i ~/.ssh/deploy_key deploy@${{ secrets.DEPLOY_HOST }} deploy-timothykim.net
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ On a fresh Rocky Linux 9 (or compatible) install:
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
dnf install -y git
|
dnf install -y git
|
||||||
git clone https://git.timothykim.net/timothykim/hantim-server.git /opt/hantim
|
git clone https://git.timothykim.net/hantim/hantim-server.git /opt/hantim
|
||||||
bash /opt/hantim/setup.sh
|
bash /opt/hantim/setup.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -84,8 +84,9 @@ After running the script:
|
|||||||
Nginx Proxy Manager certs and Let's Encrypt account keys are encrypted with
|
Nginx Proxy Manager certs and Let's Encrypt account keys are encrypted with
|
||||||
git-crypt (see `.gitattributes`). You need the git-crypt key to unlock them.
|
git-crypt (see `.gitattributes`). You need the git-crypt key to unlock them.
|
||||||
|
|
||||||
The following secrets must be configured in the Gitea repo settings for
|
The following secrets must be configured in the `hantim` Gitea org settings
|
||||||
deploys to work:
|
(Settings > Actions > Secrets) and are shared across all repos:
|
||||||
|
|
||||||
- `DEPLOY_HOST` -- the server's IP or hostname
|
- `DEPLOY_HOST` -- the server's IP or hostname
|
||||||
- `DEPLOY_KEY` -- the SSH private key for the `deploy` user
|
- `DEPLOY_SSH_KEY` -- the SSH private key for the `deploy` user
|
||||||
|
- `REGISTRY_TOKEN` -- Gitea personal access token for Docker registry login
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
static:
|
static:
|
||||||
image: git.timothykim.net/timothykim/static:latest
|
image: git.timothykim.net/hantim/static:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
container_name: timothykim
|
container_name: timothykim
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
+2
-2
@@ -26,7 +26,7 @@ mkdir -p "$REPO_ROOT/docker/$APP"
|
|||||||
cat > "$REPO_ROOT/docker/$APP/compose.yml" <<EOF
|
cat > "$REPO_ROOT/docker/$APP/compose.yml" <<EOF
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: git.timothykim.net/timothykim/$APP:latest
|
image: git.timothykim.net/hantim/$APP:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- shared
|
- shared
|
||||||
@@ -54,7 +54,7 @@ jobs:
|
|||||||
- name: Deploy via SSH
|
- name: Deploy via SSH
|
||||||
run: |
|
run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/deploy_key
|
echo "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/deploy_key
|
||||||
chmod 600 ~/.ssh/deploy_key
|
chmod 600 ~/.ssh/deploy_key
|
||||||
ssh -o StrictHostKeyChecking=accept-new -i ~/.ssh/deploy_key deploy@${{ secrets.DEPLOY_HOST }} deploy-APP_PLACEHOLDER
|
ssh -o StrictHostKeyChecking=accept-new -i ~/.ssh/deploy_key deploy@${{ secrets.DEPLOY_HOST }} deploy-APP_PLACEHOLDER
|
||||||
OUTER
|
OUTER
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ set -euo pipefail
|
|||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# 1. dnf install -y git
|
# 1. dnf install -y git
|
||||||
# 2. git clone https://git.timothykim.net/timothykim/hantim-server.git /opt/hantim
|
# 2. git clone https://git.timothykim.net/hantim/hantim-server.git /opt/hantim
|
||||||
# 3. bash /opt/hantim/setup.sh
|
# 3. bash /opt/hantim/setup.sh
|
||||||
#
|
#
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ fi
|
|||||||
|
|
||||||
if [ "$(dirname "$(readlink -f "$0")")" != "$REPO_DIR" ]; then
|
if [ "$(dirname "$(readlink -f "$0")")" != "$REPO_DIR" ]; then
|
||||||
echo "ERROR: Repo does not appear to be cloned to $REPO_DIR."
|
echo "ERROR: Repo does not appear to be cloned to $REPO_DIR."
|
||||||
echo " git clone https://git.timothykim.net/timothykim/hantim-server.git $REPO_DIR"
|
echo " git clone https://git.timothykim.net/hantim/hantim-server.git $REPO_DIR"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user