diff options
| author | EuAndreh <eu@euandre.org> | 2023-03-27 14:41:36 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2023-03-27 15:06:51 -0300 |
| commit | 2bbe3fd19e1f057a7129365cdb4ef5e9336e977e (patch) | |
| tree | 629054488757080873a557ab31ae89c537fa2605 /src/infrastructure/scripts | |
| parent | rc.sh: Conditionally "mkdir -p $XDG_*" (diff) | |
| download | server-2bbe3fd19e1f057a7129365cdb4ef5e9336e977e.tar.gz server-2bbe3fd19e1f057a7129365cdb4ef5e9336e977e.tar.xz | |
src/infrastructure/config/conf.env: Use file to parameterize reconfigure(8) and report(8) scripts
Notes
See CI logs with:
git notes --ref=refs/notes/ci-logs show 2bbe3fd19e1f057a7129365cdb4ef5e9336e977e
git notes --ref=refs/notes/ci-data show 2bbe3fd19e1f057a7129365cdb4ef5e9336e977e
Exit status: 128
Duration: 0
Diffstat (limited to 'src/infrastructure/scripts')
| -rwxr-xr-x | src/infrastructure/scripts/reconfigure.sh | 7 | ||||
| -rwxr-xr-x | src/infrastructure/scripts/report.sh | 17 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/infrastructure/scripts/reconfigure.sh b/src/infrastructure/scripts/reconfigure.sh index 945f115..ed3da6f 100755 --- a/src/infrastructure/scripts/reconfigure.sh +++ b/src/infrastructure/scripts/reconfigure.sh @@ -85,8 +85,10 @@ while getopts 'nUh' flag; do done shift $((OPTIND - 1)) +# shellcheck source=/dev/null +. /etc/conf.env SHA="${1:-main}" -REPO='/srv/git/servers.git' +REPO="/srv/git/$REPO_NAME" NOW="$(date '+%Y-%m-%dT%H:%M:%S%:z')" NOW_DIR=/opt/deploy/"$NOW" NPROC=$(($(nproc) * 2 + 1)) @@ -135,6 +137,7 @@ else --chown=deployer:deployer \ -a \ --exclude='dev/ci/*' \ - /run/current-system/profile/share/doc/servers/ /srv/www/s/servers/ + /run/current-system/profile/share/doc/"$NAME"/ "$HTML_OUTDIR" + deploy fi diff --git a/src/infrastructure/scripts/report.sh b/src/infrastructure/scripts/report.sh index 54fbcd8..5c89b91 100755 --- a/src/infrastructure/scripts/report.sh +++ b/src/infrastructure/scripts/report.sh @@ -119,6 +119,15 @@ if [ -z "${OUTDIR:-}" ]; then exit 2 fi +if [ -r src/infrastructure/config/conf.env ]; then + CONF=src/infrastructure/config/conf.env +else + CONF=/etc/conf.env +fi + +# shellcheck source=/dev/null +. "$CONF" + esc() { sed \ @@ -147,9 +156,9 @@ done <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> - <meta name="description" content="CI logs for servers" /> + <meta name="description" content="CI logs for $NAME" /> <link rel="icon" type="image/svg+xml" href="/favicon.svg" /> - <title>servers - CI logs</title> + <title>$NAME - CI logs</title> <style> body { max-width: 800px; @@ -175,7 +184,7 @@ done <main> <h1> CI logs for - <a href="https://euandre.org/git/servers/">servers</a> + <a href="$HOMEPAGE">$NAME</a> </h1> <ol> EOF @@ -205,7 +214,7 @@ done <li id="$FILENAME"> <a href="#$FILENAME"><pre>#</pre></a> $STATUS_MARKER - <pre>${DURATION:-?}s</pre> - <pre>(<a href="https://euandre.org/git/servers/commit/?id=$SHA">commit</a>)</pre> + <pre>(<a href="${CGIT_URL}${SHA}">commit</a>)</pre> <a href="logs/$FILENAME"><pre>$FILENAME</pre></a> <br /> <code><pre>$MESSAGE</pre></code> |