X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_website.sh;h=f781905cc6ce4ea10770c7bde7cf55a66d26ea91;hb=6b847de2430565e7cd7b654b5cffb6aa1b64a44b;hp=ac2d7310398179ea629ff5c2512daef96b390091;hpb=229bf1d61b7c115094a2c065ecdb9df4f04ed4dd;p=config

diff --git a/buster/setup_scripts/setup_website.sh b/buster/setup_scripts/setup_website.sh
index ac2d731..f781905 100755
--- a/buster/setup_scripts/setup_website.sh
+++ b/buster/setup_scripts/setup_website.sh
@@ -1,19 +1,23 @@
 #!/bin/sh
 set -e
 
-if [ "$#" -ne 5 ]; then
-    echo 'Need domain name and mail and old server IP and key ID and init state (old, new?) as argument.'
+if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
+    echo 'Need domain name and mail and key ID and init state and possibly old server IP as argument.'
     false
 fi
-if [ ! "$5" = "old" ] && [ ! "$5" = "new" ]; then
-    echo "Need init state to be either 'old' or 'new'"
+if [ ! "$4" = "copy" ] && [ ! "$4" = "new" ] && [ ! "$4" = "upgrade" ]; then
+    echo "Need init state to be either 'copy' or 'new' or 'upgrade'"
+    false
+fi
+if [ ! "$4" = "new" ] and [ "$#" -ne 5 ]; then
+    echo "With init state != 'new' need fifth argument old server IP."
     false
 fi
 domain="$1"
 mail="$2"
-old_server="$3"
-gpg_key="$4"
-init_state="$5"
+gpg_key="$3"
+init_state="$4"
+old_server="$5"
 
 # Install configs, set up firewall.
 config_tree_prefix="${HOME}/config/buster"
@@ -27,11 +31,13 @@ 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
+if [ ! "${init_state}" = "new" ]; then
+  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
+fi
 
 # Set up repos dir.
 # To use this dir, "git clone --mirror" repo source paths into it as user plom.
@@ -43,7 +49,11 @@ if [ "${init_state}" = "new" ]; then
 else
   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
+  if ["${init_state}" = "copy" ]; then
+    su -lc "./mirror_dir.sh ${old_server} /var/repos" plom
+  else
+    su -lc "./mirror_dir.sh ${old_server} /var/public_repos" plom
+  fi
   chmod a-w /var
   rm /home/plom/mirror_dir.sh
 fi
@@ -57,11 +67,14 @@ ln -s /etc/nginx/sites-available/website.nginx /etc/nginx/sites-enabled/website.
 rm -rf /var/www
 mkdir /var/www
 chown plom:plom /var/www
-if [ "${init_state}" = "new" ]; then
+if [ "${init_state}" = "upgrade" ]; 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
+elif [ "${init_state}" = "new" ]; then
+  su -lc "cd /var/repos && git init --bare website" plom
 fi
+# TODO: find out whether this can be part of cloned repo …?
+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.