[git] gnupg-doc - branch, master, updated. 76f96e5358fa26ff602e41e8acb995692e69eefb

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  76f96e5358fa26ff602e41e8acb995692e69eefb (commit)
      from  9a0bed8d819c72535b4368e1c7f9b53bdffe3043 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 76f96e5358fa26ff602e41e8acb995692e69eefb
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jul 19 15:07:54 2016 +0200

    web: Do not build an index.
    
    * tools/build-website.sh: Disable VC backends.
    * web/share/gpgweb.el (gpgweb-setup-project): Do not build the index.
    --
    
    The index requires an change in org-mode because our goal is to be
    able to build from a read-only checkout.  Even w/o the index there is
    still a problem building it because our use of org-publish-find-title
    in gpgweb-postprocess-html results in an access to a killed buffer if
    the checkout is read-only.
    
    The actual plan is to build the web site from a script which delegates
    the actual building to a separate user with limited permissions.
    After the building the rendered files are copied to the web server
    dir.  The command to run the rendering will be
    
      userv otheruser gpgweb-render
    
    with the userv script for otheruser
    
    =============================================
    If ( glob calling-user myuser
         & glob service gpgweb-render
       )
           reset
           suppress-args
           cd /home/wk/s
           execute /home/myuser/bin/build-www.gnupg.org.sh --render
    else
           error Nothing to do for this user and service
    fi
    quit
    =============================================

diff --git a/tools/build-website.sh b/tools/build-website.sh
index e5a2002..805970a 100755
--- a/tools/build-website.sh
+++ b/tools/build-website.sh
@@ -36,6 +36,7 @@ emacs23 -q --batch  \
   --eval "(require 'assoc)" \
   --eval "(require 'org)" \
   --eval "(setq make-backup-files nil)" \
+  --eval "(setq vc-handled-backends nil)" \
   --eval "(setq gpgweb-root-dir  \"${root_dir}/\")" \
   --eval "(setq gpgweb-stage-dir \"${stage_dir}/\")" \
   --eval "(require 'gpgweb (concat gpgweb-root-dir \"share/gpgweb.el\"))" \
@@ -44,7 +45,7 @@ emacs23 -q --batch  \
   --eval "(setq org-export-html-coding-system 'utf-8)" \
   --eval "(gpgweb-setup-project)" \
   --eval "(org-publish-initialize-cache \"gpgweb\")" \
-  --eval "(message \"root=(%s)\" gpgweb-root-dir)" \
+  --eval "(setq debug-on-error nil)" \
   --eval "(org-publish \"gpgweb\" t nil)"
 
 echo "$rev" > ${stage_dir}/.revlast
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index a1e9556..7458dfe 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -2,6 +2,8 @@
 
 (require 'org-exp)
 
+;; makeindex disabled because the generated file is created in the
+;; source directory.
 (defun gpgweb-setup-project ()
   "Set up an org-publish project for the gnupg.org website."
   (progn
@@ -18,7 +20,7 @@
      :section-numbers nil
      :tags nil
      :with-toc nil
-     :makeindex t
+     :makeindex nil
      :auto-sitemap nil
      :sitemap-title "GnuPG - Sitemap"
      :sitemap-sort-folders "last"

-----------------------------------------------------------------------

Summary of changes:
 tools/build-website.sh | 3 ++-
 web/share/gpgweb.el    | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org