X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_dumpsite.sh;h=60757f0387c32234f91e7594329fc03a0ce2d146;hb=1f8bddc9121f9ca69eee4dd4c933bd3071aa6841;hp=860a3a05e9a52cf947ef51d3399dc5533522c8a7;hpb=439348e7d8dc7945674b30ad78b1e787b6ea315e;p=config

diff --git a/buster/setup_scripts/setup_dumpsite.sh b/buster/setup_scripts/setup_dumpsite.sh
index 860a3a0..60757f0 100755
--- a/buster/setup_scripts/setup_dumpsite.sh
+++ b/buster/setup_scripts/setup_dumpsite.sh
@@ -43,10 +43,11 @@ su -lc "ln -s /home/plom/${geheim_dir} /var/www-dump/${geheim_dir}" plom
 #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
-scp plom@${old_server}:/var/www-dump/password_geheim /var/www-dump/password_geheim
-rm /home/plom/{prepare_to_meet_server,mirror_dir}.sh
+su -lc "./mirror_dir.sh ${old_server} /home/plom/${dump_dir}" plom
+su -lc "./mirror_dir.sh ${old_server} /home/plom/${geheim_dir}" plom
+su -lc "scp plom@${old_server}:/var/www-dump/password_geheim ~" plom
+mv /home/plom/password_geheim /var/www-dump/password_geheim
+rm /home/plom/mirror_dir.sh
 
 # Set up redo.
 wget http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz
@@ -77,10 +78,11 @@ 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
-rm /home/plom/{prepare_to_meet_server,mirror_dir}.sh
+rm /home/plom/,mirror_dir.sh
 
 # Set up index.html
 cp "${config_tree_prefix}/other_files/dumpsite_index.html" /var/www-dump/index.html