From: Christian Heller Date: Sat, 18 Apr 2020 19:23:56 +0000 (+0200) Subject: Fix. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/%7B%7Bprefix%7D%7D/pick_tasks?a=commitdiff_plain;h=e7464745efe239022d0089aa28f80265205ab942;p=config Fix. --- diff --git a/buster/setup_scripts/setup_website.sh b/buster/setup_scripts/setup_website.sh index 9394a94..a6de75e 100755 --- a/buster/setup_scripts/setup_website.sh +++ b/buster/setup_scripts/setup_website.sh @@ -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 - 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 @@ -73,9 +73,13 @@ if [ "${init_state}" = "upgrade" ]; then elif [ "${init_state}" = "new" ]; then 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 +# 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' @@ -128,7 +132,6 @@ systemctl enable plomlombot.service 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