X-Git-Url: https://plomlompom.com/repos/?p=config;a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_website.sh;h=ac2d7310398179ea629ff5c2512daef96b390091;hp=38b49a20595a4715ec21c06c2b688504d7026d1c;hb=229bf1d61b7c115094a2c065ecdb9df4f04ed4dd;hpb=e030933cc9421a5e5bce9c8462a8c4e8f4a1de5e diff --git a/buster/setup_scripts/setup_website.sh b/buster/setup_scripts/setup_website.sh index 38b49a2..ac2d731 100755 --- a/buster/setup_scripts/setup_website.sh +++ b/buster/setup_scripts/setup_website.sh @@ -58,6 +58,7 @@ rm -rf /var/www mkdir /var/www chown plom:plom /var/www if [ "${init_state}" = "new" ]; then + # This assumes the old core.plomlompom.com filesystem hierarchy. su -lc "cd /var/repos && git clone --mirror ${old_server}:repos/website" plom cp "${config_tree_prefix}/other_files/website_hook_post-receive" /var/repos/website.git/hooks/post-receive fi @@ -90,6 +91,8 @@ chown -R plom:plom "${irclogs_dir}" mkdir -p "${irclogs_pw_dir}" chown -R plom:plom "${irclogs_pw_dir}" if [ "${init_state}" = "new" ]; then + # Handle the case that the repo is in the old pre-buster server setup – + # even then, the URL should be the same. su -lc "cd /var/repos && git clone --mirror https://plomlompom.com/repos/clone/plomlombot-irc" plom su -lc "touch /var/repos/plomlombot-irc.git/git-daemon-export-ok" plom cp "${config_tree_prefix}/other_files/plomlombot_hook_post-receive" /var/repos/plomlombot-irc.git/hooks/post-receive @@ -105,7 +108,7 @@ else su -lc "./mirror_dir.sh ${old_server} /home/plom/plomlombot_db" plom rm /home/plom/mirror_dir.sh su -lc "scp plom@${old_server}:.plomlombot ~" plom - ssh plom@"${old_server}" "su -lc 'service plomlombot stop'" + su -lc "ssh plom@${old_server} \"su -lc 'service plomlombot stop'\"" plom fi systemctl enable plomlombot.service