X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;ds=sidebyside;f=buster%2Fsetup_scripts%2Fsetup_website.sh;h=d1dc91d7b756907ebedf1aecbade35eed0812839;hb=15171dcfb9e48aa0311fb77948478dbca48245fa;hp=17025609b29ce8d208959cc3bf0a60fa559e463f;hpb=dcebca7ba214a0a7961c84176606f6e4ae696e02;p=config
diff --git a/buster/setup_scripts/setup_website.sh b/buster/setup_scripts/setup_website.sh
index 1702560..d1dc91d 100755
--- a/buster/setup_scripts/setup_website.sh
+++ b/buster/setup_scripts/setup_website.sh
@@ -1,19 +1,25 @@
#!/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" = "copy" ] && [ ! "$5" = "new" ] && [ ! "$5" = "upgrade" ]; then
+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" ] && [ "$#" -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"
+
+# NOTE: init_state=upgrade is for migration from older stretch server setup
# Install configs, set up firewall.
config_tree_prefix="${HOME}/config/buster"
@@ -27,11 +33,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 +51,7 @@ if [ "${init_state}" = "new" ]; then
else
cp "${config_tree_prefix}/setup_scripts/mirror_dir.sh" /home/plom/
chmod a+w /var
- if ["${init_state}" = "copy" ]; then
+ 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
@@ -63,11 +71,10 @@ mkdir /var/www
chown plom:plom /var/www
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
+ su -lc "cd /var/repos && git clone --mirror plom@core.plomlompom.com:repos/website" plom
elif [ "${init_state}" = "new" ]; then
- su -lc "cd /var/repos && git init --bare website" plom
+ su -lc "cd /var/repos && git init --bare website.git" 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
@@ -117,12 +124,14 @@ else
su -lc "scp plom@${old_server}:.plomlombot ~" plom
su -lc "ssh plom@${old_server} \"su -lc 'service plomlombot stop'\"" plom
fi
-
systemctl enable plomlombot.service
service plomlombot start
+# In the above step, we might have created a root-owned /var/www/html â
+# fix this here.
+chown -R plom:plom /var/www/html
+
# TODO:
-# - commit git-daemon-export-ok directly into the public repos; rename
-# /home/plom/public_repos to /home/plom/repos
+# - rename /home/plom/public_repos to /home/plom/repos
service nginx restart