aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2023-03-30 15:39:40 -0300
committerEuAndreh <eu@euandre.org>2023-03-30 15:39:40 -0300
commit1931c36d6db7d08bf28c3fef8d9a67b8221d453f (patch)
tree5f74d85bb1abad4245427664e2202238a0fd461b
parentconf.env: Separate $HTML_OUTDIR into $HTML_OUTDIR_{OUT,CI} (diff)
downloadtoph-1931c36d6db7d08bf28c3fef8d9a67b8221d453f.tar.gz
toph-1931c36d6db7d08bf28c3fef8d9a67b8221d453f.tar.xz
reconfigure: Stop deleting CI directory again
Notes
See CI logs with: git notes --ref=refs/notes/ci-logs show 1931c36d6db7d08bf28c3fef8d9a67b8221d453f git notes --ref=refs/notes/ci-data show 1931c36d6db7d08bf28c3fef8d9a67b8221d453f Exit status: 1 Duration: 17
-rw-r--r--src/infrastructure/config/conf.env5
-rwxr-xr-xsrc/infrastructure/scripts/reconfigure.sh1
2 files changed, 4 insertions, 2 deletions
diff --git a/src/infrastructure/config/conf.env b/src/infrastructure/config/conf.env
index 04af0c4..7a75a1a 100644
--- a/src/infrastructure/config/conf.env
+++ b/src/infrastructure/config/conf.env
@@ -4,9 +4,10 @@ NAME='servers'
TLD='euandre.org'
RSYNC_ACCT='zh3051@zh3051'
OUT_SUFFIX="s/$NAME"
-HTML_OUTDIR_TOP="/srv/www/$OUT_SUFFIX"
-HTML_OUTDIR_CI="$HTML_OUTDIR_TOP/ci"
+CI_SUFFIX="ci"
+HTML_OUTDIR_TOP="/srv/www/$OUT_SUFFIX"
+HTML_OUTDIR_CI="$HTML_OUTDIR_TOP/$CI_SUFFIX"
RSYNC_ADDR="$RSYNC_ACCT.rsync.net"
HOMEPAGE="https://$TLD/$OUT_SUFFIX/"
CGIT_URL="https://$TLD/git/$NAME/commit/?id="
diff --git a/src/infrastructure/scripts/reconfigure.sh b/src/infrastructure/scripts/reconfigure.sh
index b11bc72..ce2d3e8 100755
--- a/src/infrastructure/scripts/reconfigure.sh
+++ b/src/infrastructure/scripts/reconfigure.sh
@@ -136,6 +136,7 @@ else
--delete \
--chmod=D775,F664 \
--chown=deployer:deployer \
+ --exclude "$CI_SUFFIX/*" \
-a \
/run/current-system/profile/share/doc/"$NAME"/ "$HTML_OUTDIR_TOP"/