From 19498cf7b573778209ed1428b17b8e626e8cbc71 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sat, 18 Apr 2020 21:42:46 +0200 Subject: [PATCH 1/1] Fix. --- buster/setup_scripts/migrate_borg.sh | 2 +- buster/setup_scripts/setup_website.sh | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/buster/setup_scripts/migrate_borg.sh b/buster/setup_scripts/migrate_borg.sh index 60e288e..a119b16 100755 --- a/buster/setup_scripts/migrate_borg.sh +++ b/buster/setup_scripts/migrate_borg.sh @@ -14,4 +14,4 @@ read -p'Hit Enter when you are done.' ignore rm /home/plom/prepare_to_meet_server.sh cp "${config_tree_prefix}/setup_scripts/mirror_dir.sh" /home/plom/ su -lc "./mirror_dir.sh ${old_server} /home/plom/borg" plom -rm /home/plom/{prepare_to_meet_server,mirror_dir}.sh +rm /home/plom/mirror_dir.sh diff --git a/buster/setup_scripts/setup_website.sh b/buster/setup_scripts/setup_website.sh index a6de75e..a29bd4a 100755 --- a/buster/setup_scripts/setup_website.sh +++ b/buster/setup_scripts/setup_website.sh @@ -75,11 +75,6 @@ elif [ "${init_state}" = "new" ]; then fi cp "${config_tree_prefix}/other_files/website_hook_post-receive" /var/repos/website.git/hooks/post-receive su -lc 'cd /var/www && git clone /var/repos/website.git .' plom -# NOTE: There seems to be a bug that creates a root-owned /var/www/html on -# init_state=copy for some reason, at least if website.git is an empty repo. -# The following might fix this: -mkdir -p /var/www/html -chown -R plom:plom /var/www/html # Add encryption key. keyservers='sks-keyservers.net/ keys.gnupg.net' @@ -127,10 +122,13 @@ else su -lc "scp plom@${old_server}:.plomlombot ~" plom su -lc "ssh plom@${old_server} \"su -lc 'service plomlombot stop'\"" plom fi - systemctl enable plomlombot.service service plomlombot start +# In the above step, we might have created a root-owned /var/www/html – +# fix this here. +chown -R plom:plom /var/www/html + # TODO: # - rename /home/plom/public_repos to /home/plom/repos -- 2.30.2