Fix.

[config] / buster / setup_scripts / setup_dumpsite.sh

diff --git a/buster/setup_scripts/setup_dumpsite.sh b/buster/setup_scripts/setup_dumpsite.sh
index 71cc6f5bd7c32e2febccd3f6458036ed5a704da0..c2592d83f4da756c40b236b7e1c4d7b96a90a249 100755 (executable)
--- a/buster/setup_scripts/setup_dumpsite.sh
+++ b/buster/setup_scripts/setup_dumpsite.sh
@@ -1,14 +1,20 @@
 #!/bin/sh
 set -e
-set -x
 
-if [ "$#" -ne 3 ]; then
-    echo 'Need domain name and mail and old server.'
+if [ "$#" -ne 4 ]; then
+    echo 'Need domain name and mail and old server and repos source ("local" or "remote"?).'
+    false
+fi
+if [ ! "$4" = "local" ] && [ ! "$4" = "remote" ]; then
+    echo "Need legal repo source name."
     false
 fi
 domain="$1"
 mail="$2"
 old_server="$3"
+repos_source="$4"
+
+read -p"Only continue if hostname is not domain of url_catcher's target mail address, else abort!" ignore
 
 # Install configs, set up firewall.
 echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections
@@ -37,11 +43,6 @@ dump_dir=dump
 geheim_dir=geheim
 su -lc "ln -s /home/plom/${dump_dir} /var/www-dump/${dump_dir}" plom
 su -lc "ln -s /home/plom/${geheim_dir} /var/www-dump/${geheim_dir}" plom
-# Use upper outcommented instead of lower code if setting up new empty server.
-#su -lc "mkdir ${dump_dir} ${geheim_dir}" plom
-#password_geheim=$(pwgen -1)
-#echo "foo:{PLAIN}${password_geheim}" > /var/www-dump/password_geheim
-#echo "geheim password is: ${password_geheim}"
 cp "${config_tree_prefix}/setup_scripts/mirror_dir.sh" /home/plom/
 su -lc "./mirror_dir.sh ${old_server} /home/plom/${dump_dir}" plom
 su -lc "./mirror_dir.sh ${old_server} /home/plom/${geheim_dir}" plom
@@ -65,7 +66,11 @@ su -lc "git clone --mirror ${old_server}:blog.git" plom
 cp "${config_tree_prefix}/other_files/blog_hook_post-receive" /home/plom/blog.git/hooks/post-receive
 su -lc "git clone ~/blog.git" plom
 # TODO: set up like plomlombot repo (with post-recieve hook)?
-su -lc "git clone https://plomlompom.com/repos/clone/redo-blog" plom
+if [ "$repo_source" = "local"]; then
+  su -lc "git clone /var/repos/redo-blog" plom
+else
+  su -lc "git clone https://plomlompom.com/repos/clone/redo-blog" plom
+fi
 su -lc "cd redo-blog && ./add_dir.sh ~/blog" plom
 su -lc "cd blog && redo" plom
 su -lc "ln -s /home/plom/blog/public /var/www-dump/blog" plom
@@ -73,12 +78,15 @@ su -lc "ln -s /home/plom/blog/public /var/www-dump/blog" plom
 
 # Set up url catcher.
 # TODO: set up like plomlombot repo (with post-recieve hook)?
-su -lc "git clone https://plomlompom.com/repos/clone/url-catcher" plom
+if [ "$repo_source" = "local"]; then
+  su -lc "git clone /var/repos/url-catcher" plom
+else
+  su -lc "git clone https://plomlompom.com/repos/clone/url-catcher" plom
+fi
 su -lc "cd url-catcher && ln -s ../blog/captchas/linkable/ captchas" plom
 cp "${config_tree_prefix}/other_files/url-catcher_customizations.json" /home/plom/url-catcher/customizations.json
 systemctl enable url_catcher.service
 service url_catcher start
-# Outcomment if setting up new / not migrating.
 cp "${config_tree_prefix}/setup_scripts/mirror_dir.sh" /home/plom/
 su -lc "./mirror_dir.sh ${old_server} /home/plom/url-catcher/ips" plom
 su -lc "./mirror_dir.sh ${old_server} /home/plom/url-catcher/lists" plom