X-Git-Url: https://plomlompom.com/repos/?p=config;a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_website.sh;h=2eabead2c8a83ea8a0bcb02bebe7c02ad8510a3e;hp=6288a27427ac416f16f065f1b5e4e8447b77afbc;hb=1a3442e26926198fc3b07b4682d6d6d2ead7099b;hpb=f0e42d4344b93ad220ff2594b3ff6d7280b2d3a7 diff --git a/buster/setup_scripts/setup_website.sh b/buster/setup_scripts/setup_website.sh index 6288a27..2eabead 100755 --- a/buster/setup_scripts/setup_website.sh +++ b/buster/setup_scripts/setup_website.sh @@ -3,13 +3,14 @@ set -e set -x # Heavily inspired by -if [ "$#" -ne 3 ]; then - echo 'Need domain name and mail and old server IP as argument.' +if [ "$#" -ne 4 ]; then + echo 'Need domain name and mail and old server IP and key ID as argument.' false fi domain="$1" mail="$2" old_server="$3" +gpg_key="$4" # Install configs, set up firewall. config_tree_prefix="${HOME}/config/buster" @@ -46,6 +47,25 @@ 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. +keyservers='sks-keyservers.net/ keys.gnupg.net' +set +e +while true; do + do_break=0 + for keyserver in $(echo "${keyservers}"); do + su plom -c "gpg --no-tty --keyserver $keyserver --recv-key ${gpg_key}" + if [ $? -eq "0" ]; then + do_break=1 + break + fi + echo "Attempt with keyserver ${keyserver} unsuccessful, trying other." + done + if [ "${do_break}" -eq "1" ]; then + break + fi +done +set -e + # Set up plomlombot. irclogs_dir=/var/www/html/irclogs irclogs_pw_dir=/var/www/irclogs_pw