Fix library inclusion.

diff --git a/bookworm/setup_scripts/mirror_dir.sh b/bookworm/setup_scripts/mirror_dir.sh
index 0fb7df79272c7c1b35258093c7028f243935381c..0660142877648f1d9b357de7300e512bee54a35c 100755 (executable)
--- 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
 #!/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
 
 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 d00efdf7f75fa544e4b718dc8964135bbeebc4d5..d8e4e83599a3b19d0e1685fb7ab122282856d940 100755 (executable)
--- 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
 #!/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"
 
 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 7348a49feeeca2f87c3339731507107ed557a7c3..14289721c9b05f9eaf01887f6df5e96eb6a9c4ba 100755 (executable)
--- 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.
 
 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
     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
     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
 fi
 
 service nginx restart