X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_website.sh;h=7fae6c31fb4c84e51d2765d0122d90b3d9a35774;hb=547a633963f60d7f2a7498c6e9ee0c22ecf502bb;hp=fef4b6772282d0cc25cf2c2d3606518032809c12;hpb=40b1aac9fad6b73589484750bc70968a260f945e;p=config

diff --git a/buster/setup_scripts/setup_website.sh b/buster/setup_scripts/setup_website.sh
index fef4b67..7fae6c3 100755
--- a/buster/setup_scripts/setup_website.sh
+++ b/buster/setup_scripts/setup_website.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 set -e
-set -x
-# Heavily inspired by <https://docs-develop.pleroma.social/backend/installation/debian_based_en/>
 
 if [ "$#" -ne 4 ]; then
     echo 'Need domain name and mail and old server IP and key ID as argument.'
@@ -23,28 +21,38 @@ ln -sf /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
 certbot --nginx --agree-tos --redirect --no-eff-email -m "${mail}" -d "${domain}"
 rm /etc/nginx/sites-enabled/default
 
+# Set up connection to old server.
+cp "${config_tree_prefix}/setup_scripts/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
+read -p'Hit Enter when you are done.' ignore
+rm /home/plom/prepare_to_meet_server.sh
+
 # Set up repos dir.
 mkdir /var/repos
 chown plom:plom /var/repos
 # To use this dir, "git clone --mirror" repo source paths into it as user plom.
 # As user plom, touch git-daemon-export-ok files into it to make the repo
 # publically available.
+# Outcomment following lines if setting up new / not migrating.
+cp "${config_tree_prefix}/setup_scripts/mirror_dir.sh" /home/plom/
+chmod a+w /var
+su -lc "./mirror_dir.sh ${old_server} /var/repos" plom
+chmod a-w /var
+rm /home/plom/mirror_dir.sh
 
 # Prepare NGINX and GitWeb config.
 sed -i "s/REPLACE_fqdn_ECALPER/${domain}/g" /etc/gitweb.conf
 sed -i "s/REPLACE_fqdn_ECALPER/${domain}/g" /etc/nginx/sites-available/website.nginx
 ln -s /etc/nginx/sites-available/website.nginx /etc/nginx/sites-enabled/website.nginx
 
-# Set up website.
+# Set up website. TODO: use non-/var/www dir for better separation to dump site
 rm -rf /var/www
 mkdir /var/www
 chown plom:plom /var/www
-cp "${config_tree_prefix}/setup_scripts/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
-read -p'Hit Enter when you are done.' ignore
-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
+# Use next two lines if setting up new / not migrating.
+#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
 su -lc 'cd /var/www && git clone /var/repos/website.git .' plom
 
 # Add encryption key.
@@ -73,23 +81,25 @@ mkdir -p "${irclogs_dir}"
 chown -R plom:plom "${irclogs_dir}"
 mkdir -p "${irclogs_pw_dir}"
 chown -R plom:plom "${irclogs_pw_dir}"
-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
+# Use following lines if setting up new / not migrating.
+#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
+
 su -lc "git clone /var/repos/plomlombot-irc.git" plom
 cp "${config_tree_prefix}/other_files/plomlombot_daemon.sh" /home/plom/
 chown plom:plom /home/plom/plomlombot_daemon.sh
-echo 'bot: plomlombog plomlombog #plomlomtest irc.freenode.net foo bar' >> /home/plom/.plomlombot
-chown plom:plom /home/plom/.plomlombot
-systemctl enable plomlombot.service
-service plomlombot start
-
-# Migrate borg repo.
+# Use upper outcommented instead of lower code if setting up new empty server.
+#echo 'bot: plomlombog plomlombog #plomlomtest irc.freenode.net foo bar' >> /home/plom/.plomlombot
+#chown plom:plom /home/plom/.plomlombot
 cp "${config_tree_prefix}/setup_scripts/mirror_dir.sh" /home/plom/
-su -lc "./mirror_dir.sh ${old_server} /home/plom/borg" plom
+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'"
 
-# Clean up
-rm /home/plom/{prepare_to_meet_server,mirror_dir}.sh
+systemctl enable plomlombot.service
+service plomlombot start
 
 # TODO:
 # - commit git-daemon-export-ok directly into the public repos; rename