home
·
contact
·
privacy
projects
/
config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix.
[config]
/
buster
/
setup_scripts
/
setup_website.sh
diff --git
a/buster/setup_scripts/setup_website.sh
b/buster/setup_scripts/setup_website.sh
index f781905cc6ce4ea10770c7bde7cf55a66d26ea91..a6de75e6b013c51a9a531fecf17173dd1b8eb601 100755
(executable)
--- a/
buster/setup_scripts/setup_website.sh
+++ b/
buster/setup_scripts/setup_website.sh
@@
-9,7
+9,7
@@
if [ ! "$4" = "copy" ] && [ ! "$4" = "new" ] && [ ! "$4" = "upgrade" ]; then
echo "Need init state to be either 'copy' or 'new' or 'upgrade'"
false
fi
echo "Need init state to be either 'copy' or 'new' or 'upgrade'"
false
fi
-if [ ! "$4" = "new" ]
and
[ "$#" -ne 5 ]; then
+if [ ! "$4" = "new" ]
&&
[ "$#" -ne 5 ]; then
echo "With init state != 'new' need fifth argument old server IP."
false
fi
echo "With init state != 'new' need fifth argument old server IP."
false
fi
@@
-49,7
+49,7
@@
if [ "${init_state}" = "new" ]; then
else
cp "${config_tree_prefix}/setup_scripts/mirror_dir.sh" /home/plom/
chmod a+w /var
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
su -lc "./mirror_dir.sh ${old_server} /var/repos" plom
else
su -lc "./mirror_dir.sh ${old_server} /var/public_repos" plom
@@
-71,11
+71,15
@@
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
elif [ "${init_state}" = "new" ]; then
# This assumes the old core.plomlompom.com filesystem hierarchy.
su -lc "cd /var/repos && git clone --mirror ${old_server}: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
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
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
+# NOTE: There seems to be a bug that creates a root-owned /var/www/html on
+# init_state=copy for some reason, at least if website.git is an empty repo.
+# The following might fix this:
+mkdir -p /var/www/html
+chown -R plom:plom /var/www/html
# Add encryption key.
keyservers='sks-keyservers.net/ keys.gnupg.net'
# Add encryption key.
keyservers='sks-keyservers.net/ keys.gnupg.net'
@@
-128,7
+132,6
@@
systemctl enable plomlombot.service
service plomlombot start
# TODO:
service plomlombot start
# 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
service nginx restart