[git] gnupg-doc - branch, master, updated. b7ffbb9799f83295ae3a14973bdc833c6476e8a8

[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  b7ffbb9799f83295ae3a14973bdc833c6476e8a8 (commit)
      from  9d07f037eb8dbbb70f22289f458c077331dd6264 (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 b7ffbb9799f83295ae3a14973bdc833c6476e8a8
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 15 15:58:07 2016 +0200

    web: Minor changes to the build foo.
    
    * web/index.org: Set the stage dir.
    * web/share/gpgweb.el (gpgweb-setup-project): Use vars for the
    directories.
    (gpgweb-upload): Do not actually upload.

diff --git a/web/index.org b/web/index.org
index b8834be..e007a31 100644
--- a/web/index.org
+++ b/web/index.org
@@ -162,6 +162,7 @@ This is the publishing info used for the GnuPG pages
 #+begin_src emacs-lisp
   (progn
    (setq gpgweb-root-dir (file-name-directory (buffer-file-name)))
+   (setq gpgweb-stage-dir (concat gpgweb-root-dir "../stage"))
    (require 'gpgweb (concat gpgweb-root-dir "share/gpgweb.el"))
    (setq org-publish-use-timestamps-flag nil)
    (setq org-export-html-toplevel-hlevel 1)
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 8d5e379..0b6091f 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -7,12 +7,12 @@
   (progn
    (require 'ox-gpgweb (concat gpgweb-root-dir "share/ox-gpgweb.el"))
    (aput 'org-publish-project-alist "gpgweb-org"
-   '(:base-directory "~/s/gnupg-doc/web"
+   `(:base-directory ,gpgweb-root-dir
      :base-extension "org"
      :language "en"
      :html-extension "html"
      :recursive t
-     :publishing-directory "../stage"
+     :publishing-directory ,gpgweb-stage-dir
      :publishing-function gpgweb-org-to-html
      :body-only t
      :section-numbers nil
@@ -29,10 +29,10 @@
      :html-head-include-scripts nil))
 
    (aput 'org-publish-project-alist "gpgweb-other"
-   '(:base-directory "."
+   `(:base-directory ,gpgweb-root-dir
      :base-extension "jpg\\|png\\|css\\|txt\\|rss\\|lst\\|sig"
      :recursive t
-     :publishing-directory "../stage"
+     :publishing-directory ,gpgweb-stage-dir
      :publishing-function org-publish-attachment
      :completion-function gpgweb-upload))
 
@@ -431,17 +431,20 @@ string of the source file or nil if not available."
           (kill-buffer work-buffer))))))
 
 
-
+;;;
+;;; We don't do an upload directly.  Instead we only print the
+;;; commands to do that.  In reality a cron jobs syncs the stage dir.
+;;;
 (defun gpgweb-upload ()
   (let ((stagedir (plist-get project-plist :publishing-directory)))
     (message "gpgweb  rootdir '%s'" gpgweb-root-dir)
     (message "gpgweb stagedir '%s'" stagedir)
-    (shell-command
+    (message
      (concat "cd " gpgweb-root-dir " && cd " stagedir
-             "&& rsync -rlt --exclude \"*~\" ./ "
+             " && echo rsync -rlt --exclude \"*~\" ./ "
              "werner at trithemius.gnupg.org:"
              "/var/www/www/www.gnupg.org/htdocs/ ;"
-             " ssh werner at trithemius.gnupg.org"
+             " echo ssh werner at trithemius.gnupg.org"
              " touch /var/www/www/www.gnupg.org/htdocs/donate/donors.dat"))
 ))
 

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

Summary of changes:
 web/index.org       |  1 +
 web/share/gpgweb.el | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)


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