From: Christian Heller Date: Tue, 26 Sep 2023 18:22:57 +0000 (+0200) Subject: Fix library inclusion. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/static/%7B%7B%20web_path%20%7D%7D/%7B%7Bprefix%7D%7D/tasks?a=commitdiff_plain;h=f628496cf28b4db65ee965218e62989d51dd7aed;p=config Fix library inclusion. --- diff --git a/bookworm/setup_scripts/mirror_dir.sh b/bookworm/setup_scripts/mirror_dir.sh index 0fb7df7..0660142 100755 --- a/bookworm/setup_scripts/mirror_dir.sh +++ b/bookworm/setup_scripts/mirror_dir.sh @@ -1,6 +1,7 @@ #!/bin/sh # Mirror directory tree from remote to local server, keeping the path. set -e +. ./misc.sh expect_n_args 2 "(server, directory)" "$@" server=$1 diff --git a/bookworm/setup_scripts/prepare_to_meet_server.sh b/bookworm/setup_scripts/prepare_to_meet_server.sh index d00efdf..d8e4e83 100755 --- a/bookworm/setup_scripts/prepare_to_meet_server.sh +++ b/bookworm/setup_scripts/prepare_to_meet_server.sh @@ -1,6 +1,7 @@ #!/bin/sh # Do some of the steps necessary to SSH (key-based) with another server. set -e +. ./misc.sh expect_n_args 1 "(server IP)" "$@" target="$1" diff --git a/bookworm/setup_scripts/setup_status.plomlompom.com.sh b/bookworm/setup_scripts/setup_status.plomlompom.com.sh index 7348a49..1428972 100755 --- a/bookworm/setup_scripts/setup_status.plomlompom.com.sh +++ b/bookworm/setup_scripts/setup_status.plomlompom.com.sh @@ -37,6 +37,7 @@ ln -s /etc/nginx/sites-available/status.plomlompom.com.nginx /etc/nginx/sites-en if [ ! -z "${mirror_ip}" ]; then # Set up connection to old server. + cp "${setup_scripts_dir}/misc.sh" /home/plom/ cp "${setup_scripts_dir}/prepare_to_meet_server.sh" /home/plom/ chown plom:plom /home/plom/prepare_to_meet_server.sh su -lc "./prepare_to_meet_server.sh ${old_server}" plom @@ -48,6 +49,7 @@ if [ ! -z "${mirror_ip}" ]; then cp "${setup_scripts_dir}/mirror_dir.sh" /home/plom/ su -lc "./mirror_dir.sh ${mirror_ip} /var/www/status.plomlompom.com" plom rm /home/plom/mirror_dir.sh + rm /home/plom/misc.sh fi service nginx restart