Browse Source

Merge branch 'chore/monoexp-domain' of bajdev/devops into main

bajdev 2 hours ago
parent
commit
df06f4ec74
5 changed files with 12 additions and 12 deletions
  1. 5 5
      README.md
  2. 3 3
      certs/issue-cert
  3. 1 1
      deployd/go.mod
  4. 2 2
      install.sh
  5. 1 1
      release/release

+ 5 - 5
README.md

@@ -1,6 +1,6 @@
 # devops
 
-Apps and scripts built as part of the DevOps pipeline for the monoaf.com
+Apps and scripts built as part of the DevOps pipeline for the monoexp.com
 server.
 
 The main piece is the **deploy pipeline**: when a pull request is merged into
@@ -66,7 +66,7 @@ Repos not listed are refused.
 Steps 1–4 match Phase 7 of the server plan. **Steps 1–3 are one script:**
 
 ```bash
-git clone https://git.monoaf.com/bajdev/devops.git ~/devops && cd ~/devops
+git clone https://git.monoexp.com/bajdev/devops.git ~/devops && cd ~/devops
 ./install.sh --dry-run    # optional: print every command, change nothing
 ./install.sh
 ```
@@ -84,7 +84,7 @@ sudo useradd -r -m -d /var/lib/deploy -s /bin/bash -G webops deploy
 sudo install -m 664 -o deploy -g webops /dev/null /var/log/deploys.log
 sudo -iu deploy sh -c 'mkdir -p -m 700 ~/.ssh && ssh-keygen -t ed25519 -N "" -f ~/.ssh/id_ed25519 -C deploy@vps'
 sudo -iu deploy git config --global user.name Deploy
-sudo -iu deploy git config --global user.email deploy@monoaf.com
+sudo -iu deploy git config --global user.email deploy@monoexp.com
 sudo cat /var/lib/deploy/.ssh/id_ed25519.pub        # for the Gogs deploy account
 ```
 
@@ -93,13 +93,13 @@ collaborator on each repo it releases. It needs Write to push tags; branch
 protection still stops it pushing to `main`. Then trust Gogs' host key:
 
 ```bash
-sudo -iu deploy ssh -o StrictHostKeyChecking=accept-new git@git.monoaf.com true
+sudo -iu deploy ssh -o StrictHostKeyChecking=accept-new git@git.monoexp.com true
 ```
 
 **2. Build and install** from a checkout of this repo:
 
 ```bash
-git clone https://git.monoaf.com/bajdev/devops.git ~/devops && cd ~/devops
+git clone https://git.monoexp.com/bajdev/devops.git ~/devops && cd ~/devops
 (cd deployd && go test ./... && CGO_ENABLED=0 go build -trimpath -o deployd .)
 sudo install -o root -g root -m 755 deployd/deployd /usr/local/bin/deployd
 sudo install -o root -g root -m 755 release/release /usr/local/bin/release

+ 3 - 3
certs/issue-cert

@@ -1,11 +1,11 @@
 #!/bin/bash
 # issue-cert <host> — request a Let's Encrypt cert using the shared ACME webroot.
-# Run through sudo by the deploy user; accepts a single *.monoaf.com hostname.
+# Run through sudo by the deploy user; accepts a single *.monoexp.com hostname.
 set -euo pipefail
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 [[ $# -eq 1 ]] || { echo "usage: issue-cert <host>" >&2; exit 2; }
 host=$1
-[[ $host =~ ^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\.)+monoaf\.com$ ]] \
-  || { echo "issue-cert: '$host' is not a monoaf.com hostname" >&2; exit 2; }
+[[ $host =~ ^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\.)+monoexp\.com$ ]] \
+  || { echo "issue-cert: '$host' is not a monoexp.com hostname" >&2; exit 2; }
 exec certbot certonly --non-interactive --webroot -w /srv/www/acme \
   -d "$host" --deploy-hook 'systemctl reload nginx'

+ 1 - 1
deployd/go.mod

@@ -1,3 +1,3 @@
-module git.monoaf.com/bajdev/devops/deployd
+module git.monoexp.com/bajdev/devops/deployd
 
 go 1.27.3

+ 2 - 2
install.sh

@@ -59,10 +59,10 @@ if exists "$home/.ssh/id_ed25519"; then
 else
   as_deploy 'mkdir -p -m 700 ~/.ssh && ssh-keygen -q -t ed25519 -N "" -f ~/.ssh/id_ed25519 -C deploy@vps'
 fi
-as_deploy 'git config --global user.name Deploy && git config --global user.email deploy@monoaf.com'
+as_deploy 'git config --global user.name Deploy && git config --global user.email deploy@monoexp.com'
 # Record Gogs' host key now. Logging in only works once the Gogs deploy
 # account has the key, so a refusal here is expected on a first install.
-as_deploy 'ssh -o StrictHostKeyChecking=accept-new -o BatchMode=yes git@git.monoaf.com true 2>/dev/null || true'
+as_deploy 'ssh -o StrictHostKeyChecking=accept-new -o BatchMode=yes git@git.monoexp.com true 2>/dev/null || true'
 
 say "2. build, test and install"
 build=$(mktemp -d); trap 'rm -rf "$build"' EXIT

+ 1 - 1
release/release

@@ -11,7 +11,7 @@
 set -euo pipefail
 
 conf=${RELEASE_CONF:-/etc/deployd/sites.json}
-git_base=${RELEASE_GIT_BASE:-git@git.monoaf.com:}
+git_base=${RELEASE_GIT_BASE:-git@git.monoexp.com:}
 work_root=${RELEASE_WORK:-/var/lib/deploy/src}
 apps=${RELEASE_APPS:-/opt/apps}
 vhosts=${RELEASE_VHOSTS:-/srv/www/vhosts}