X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Flhc-remorque%2Fconfigure.sh;h=8e07c618b1ce477c88a1342ac2598032251e23c3;hb=8eaa235cf3ba97f3d3f6bde5b4348ae4b3eabf21;hp=59645ad007ea7a8daaeacd02bb3cfa8dc6f90dca;hpb=b7595a000cae850e0702938336ce116376bc7d67;p=lhc%2Fateliers.git diff --git a/etc/nginx/site.d/lhc-remorque/configure.sh b/etc/nginx/site.d/lhc-remorque/configure.sh index 59645ad..8e07c61 100644 --- a/etc/nginx/site.d/lhc-remorque/configure.sh +++ b/etc/nginx/site.d/lhc-remorque/configure.sh @@ -43,34 +43,29 @@ sudo install -m 3771 -o git -g git /dev/stdin \ exec /home/git/hooks/remorque/post-update.ikiwiki EOF -if test -d /home/lhc/var/ikiwiki/remorque/.git +if sudo test -d /home/lhc/var/ikiwiki/remorque/.git then sudo -u wiki-"$site" \ sh -c 'cd /home/lhc/var/ikiwiki/remorque && git pull -v' else - ( - eval cd ~wiki-"$site" - set +f sudo -u wiki-"$site" \ git clone \ git@localhost:remorqueatelier \ /home/lhc/var/ikiwiki/remorque/git + set +f sudo mv -i \ /home/lhc/var/ikiwiki/remorque/git/.git* \ /home/lhc/var/ikiwiki/remorque/git/* \ /home/lhc/var/ikiwiki/remorque/ - ) sudo rmdir /home/lhc/var/ikiwiki/remorque/git fi sudo install -m 400 -o wiki-"$site" -g wiki-"$site" \ "$tool"/etc/nginx/site.d/"$site"/ikiwiki.setup \ /home/lhc/var/ikiwiki/remorque/etc/ikiwiki.setup -eval cd ~wiki-"$site" sudo adduser wiki-"$site" www-"$site" - sudo install -d -m 2770 -o wiki-"$site" -g fcgi-"$site" \ /home/www/pub/"$site"/cgi - +cd / sudo -u wiki-"$site" ikiwiki \ --verbose \ --setup /home/lhc/var/ikiwiki/remorque/etc/ikiwiki.setup \