diff options
| -rwxr-xr-x | src/infrastructure/ci/git-post-receive.sh | 2 | ||||
| -rw-r--r-- | src/infrastructure/config/conf.env | 3 | ||||
| -rwxr-xr-x | src/infrastructure/scripts/reconfigure.sh | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/infrastructure/ci/git-post-receive.sh b/src/infrastructure/ci/git-post-receive.sh index 65a17a5..612a268 100755 --- a/src/infrastructure/ci/git-post-receive.sh +++ b/src/infrastructure/ci/git-post-receive.sh @@ -144,7 +144,7 @@ mkdtemp() { --chown=deployer:deployer \ --delete \ -a \ - "$DIR"/ "$HTML_OUTDIR"/ci/ + "$DIR"/ "$HTML_OUTDIR_CI"/ rm -rf "$DIR" } 1>/dev/null 2>&1 & } diff --git a/src/infrastructure/config/conf.env b/src/infrastructure/config/conf.env index 7c683f3..04af0c4 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" RSYNC_ADDR="$RSYNC_ACCT.rsync.net" -HTML_OUTDIR="/srv/www/$OUT_SUFFIX/" HOMEPAGE="https://$TLD/$OUT_SUFFIX/" CGIT_URL="https://$TLD/git/$NAME/commit/?id=" REPO_NAME="$NAME.git" diff --git a/src/infrastructure/scripts/reconfigure.sh b/src/infrastructure/scripts/reconfigure.sh index ed3da6f..b11bc72 100755 --- a/src/infrastructure/scripts/reconfigure.sh +++ b/src/infrastructure/scripts/reconfigure.sh @@ -133,11 +133,11 @@ else sudo -i guix system -c$NPROC -v3 reconfigure /etc/guix/system.scm sudo -u deployer rsync \ + --delete \ --chmod=D775,F664 \ --chown=deployer:deployer \ -a \ - --exclude='dev/ci/*' \ - /run/current-system/profile/share/doc/"$NAME"/ "$HTML_OUTDIR" + /run/current-system/profile/share/doc/"$NAME"/ "$HTML_OUTDIR_TOP"/ deploy fi |