Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 2df5a727c08b28a029127f1fdff5b368ed56c7a1..0c210b64d6b78f2f028d07680a566137833656d4 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -140,10 +140,18 @@ sub preprocess (@) { #{{{
                if (exists $params{server} && safeurl($params{server})) {
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
                                '" rel="openid.server" />';
+                       push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
+                               '" rel="openid2.provider" />';
                }
                if (safeurl($value)) {
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
                                '" rel="openid.delegate" />';
+                       push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
+                               '" rel="openid2.local_id" />';
+               }
+               if (exists $params{xrds-location} && safeurl($params{xrds-location})) {
+                       push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
+                               'content="'.encode_entities($params{xrds-location}).'" />';
                }
        }
        elsif ($key eq 'redir') {

diff --git a/debian/changelog b/debian/changelog
index 80d938927e73c63ea375257f2c3f35a1688c3df2..bd72e9fc0f54781fdd1631daf219547d1b47ddff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ ikiwiki (2.41) UNRELEASED; urgency=low
   [ martin f. krafft ]
   * The meta plugin now allows for the robots tag to be specified without the
     risk of it being scrubbed.
+  * Let meta.openid set X-XRDS-Location header
+  * Make makerepo set the Git merge remote.
+    branch.master.remote previously used to default to origin, which has
+    recently been changed; it now needs to be set explicitly, which this
+    patch does. Closes: #470517
+  * meta: Also generate openid2 headers.
 
   [ Joey Hess ]
   * Add recentchangesdiff plugin that adds diffs to the recentchanges feeds.

diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn
index 9f8693ec4a0c04c5d27cd4325734867303c9cc38..485ac882690dbd030bf3e3822ffcf6b1f0580120 100644 (file)
--- a/doc/ikiwiki.mdwn
+++ b/doc/ikiwiki.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 [[!if test="enabled(version)"
      then="(Currently running version [[!version ]].)"

diff --git a/doc/ikiwiki/blog.mdwn b/doc/ikiwiki/blog.mdwn
index 6a206bb629a08b15e492e89fa33cf3a48c109c9f..f1293ece87c7dd70d4fd25059ea9287d11bcaea6 100644 (file)
--- a/doc/ikiwiki/blog.mdwn
+++ b/doc/ikiwiki/blog.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 [[!if test="enabled(inline)"
      then="This wiki has the inline plugin **enabled**."
      else="This wiki has the inline plugin **disabled**."]]

diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn
index dc1fa77fd7d2e0706cb3e7b45c8549d32f6d62c7..29dbce181563ce00af528ffe1cc9918e8da87e49 100644 (file)
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -1,4 +1,5 @@
 [[!meta title="Formatting wiki pages"]]
+[[!meta robots="noindex, follow"]]
 
 Text on this wiki is, by default, written in a form very close to how you
 might write text for an email message. This style of text formatting is

diff --git a/doc/ikiwiki/markdown.mdwn b/doc/ikiwiki/markdown.mdwn
index 73aee9c1619409a331a67260a86ea9f1f8ab5495..7c3b71f70ce5d9f135c3e8768ca69e4aa364a17b 100644 (file)
--- a/doc/ikiwiki/markdown.mdwn
+++ b/doc/ikiwiki/markdown.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 [Markdown](http://daringfireball.net/projects/markdown/)
 is a minimal markup language that resembles plain text as used in
 email messages. It is the markup language used by this wiki by default.

diff --git a/doc/ikiwiki/openid.mdwn b/doc/ikiwiki/openid.mdwn
index 01a4b32b725bb373268e06f4794f5275fb4645f2..8fd70865925ff4f647e7ec823b02c82002237352 100644 (file)
--- a/doc/ikiwiki/openid.mdwn
+++ b/doc/ikiwiki/openid.mdwn
@@ -1,4 +1,5 @@
 [[!meta title="OpenID"]]
+[[!meta robots="noindex, follow"]]
 
 [[!if test="enabled(openid)"
      then="This wiki has OpenID **enabled**."

diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 3cd6bb9f467544da33deff82bffcaf8ed2e77baf..156e3f6ca84a40eeb1c0b2009200d48f28675996 100644 (file)
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 To select a set of pages, such as pages that are locked, pages
 whose commit emails you want subscribe to, or pages to combine into a
 blog, the wiki uses a PageSpec. This is an expression that matches

diff --git a/doc/ikiwiki/preprocessordirective.mdwn b/doc/ikiwiki/preprocessordirective.mdwn
index 2cb602ebe114151a85ca59f44890b3cf236fe00b..743c0d9f5e73050d3b52a6fdb72ca6b188ea5b6c 100644 (file)
--- a/doc/ikiwiki/preprocessordirective.mdwn
+++ b/doc/ikiwiki/preprocessordirective.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 Preprocessor directives are similar to a [[WikiLink]] in form, except they
 begin with `!` and may contain parameters. The general form is:
 

diff --git a/doc/ikiwiki/subpage.mdwn b/doc/ikiwiki/subpage.mdwn
index 43669209c7c59b89d5f807ac9fd8cd8087a7dd8f..e047b860cabe4207b6c4385ea2611635b4633819 100644 (file)
--- a/doc/ikiwiki/subpage.mdwn
+++ b/doc/ikiwiki/subpage.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 ikiwiki supports placing pages in a directory hierarchy. For example,
 this page, [[SubPage]] has some related pages placed under it, like
 [[SubPage/LinkingRules]]. This is a useful way to add some order to your

diff --git a/doc/ikiwiki/subpage/linkingrules.mdwn b/doc/ikiwiki/subpage/linkingrules.mdwn
index c1062304aa9d8215ff6afd406c84e4e8de32bbe5..e547f3090a3a5c3a0fd79c80acf1dc787f4f3487 100644 (file)
--- a/doc/ikiwiki/subpage/linkingrules.mdwn
+++ b/doc/ikiwiki/subpage/linkingrules.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 To link to or from a [[SubPage]], you can normally use a regular
 [[WikiLink]] that does not contain the name of the parent directory of
 the [[SubPage]]. Ikiwiki descends the directory hierarchy looking for a

diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index debbe7305a8b109e37f6c3a57c7f024b7657b765..bd5e3d1850a3fef2acf7afb20318f7bd908f33ed 100644 (file)
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 WikiLinks provide easy linking between pages of the wiki. To create a
 [[WikiLink]], just put the name of the page to link to in double brackets.
 For example `\[[WikiLink]]`.
@@ -32,4 +33,4 @@ in WikiLinks, and must replace spaces with underscores.  The newer
 syntax, enabled with the `prefix_directives` option in an ikiwiki
 setup file, prefixes directives with `!`, and thus does not prevent
 links with spaces.  Future versions of ikiwiki will turn this option
-on by default.
\ No newline at end of file
+on by default.

diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index b503e45112f029da47c2e185678e6660a8517cde..0a934fc5cb73438f43e7d1c147f527db95007b0b 100644 (file)
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -64,10 +64,15 @@ Supported fields:
 * openid
 
   Adds html <link> tags to perform OpenID delegation to an external
-  OpenID server. This lets you use an ikiwiki page as your OpenID. Example:
+  OpenID server (for `openid` and `openid2`). An optional `xrds-location`
+  parameter lets you specify the location of any [eXtensible Resource
+  DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).
 
-       \\[[meta openid="http://joeyh.myopenid.com/"
-       server="http://www.myopenid.com/server"]]
+  This lets you use an ikiwiki page as your OpenID. Example:
+
+       \\[[meta openid="http://joeyh.myopenid.com/"
+       server="http://www.myopenid.com/server"
+       xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]]
 
 * link
 

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 205cb5b04ee19a898e474373297e8832bf7eeeb5..58d5d11461f77194036c30b919f61d42a53e2dc3 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 [[!if test="enabled(template)"
 then="This wiki has templates **enabled**."
 else="This wiki has templates **disabled**."

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index a97c060c2a15d81f85a90f13722672c8c6bb94ea..6ae3e28a3a7ee8a9cdc8bd769439c7e8433406cb 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -62,6 +62,7 @@ git)
        git commit -m "initial commit"
        git remote add origin "$repository"
        git config branch.master.merge refs/heads/master
+       git config branch.master.remote origin
        git push --all
        echo "Directory $srcdir is now a clone of $rcs repository $repository"
 ;;

diff --git a/underlays/basewiki/blog.mdwn b/underlays/basewiki/blog.mdwn
index c0c3ef5f261758c90f6f0eba39537cda9e61e3d4..d9faeb84a0d2db600c7a2c69fdcdf468300fc8c7 100644 (file)
--- a/underlays/basewiki/blog.mdwn
+++ b/underlays/basewiki/blog.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/blog delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/blog|ikiwiki/blog]]. Please update your
 links, as this redirection page will be removed in a future ikiwiki

diff --git a/underlays/basewiki/helponformatting.mdwn b/underlays/basewiki/helponformatting.mdwn
index 437a2466d025adcc868a2d91fc2bbc7feb909792..9e7987613748b4a7f24feb6c489aa6e2de788d08 100644 (file)
--- a/underlays/basewiki/helponformatting.mdwn
+++ b/underlays/basewiki/helponformatting.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/formatting delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/formatting|ikiwiki/formatting]]. Please
 update your links, as this redirection page will be removed in a future

diff --git a/underlays/basewiki/markdown.mdwn b/underlays/basewiki/markdown.mdwn
index 03ce257451e16889999c104c135bd21bb2c67319..cefd2f59828294a212c1f8b96695c52481f347e0 100644 (file)
--- a/underlays/basewiki/markdown.mdwn
+++ b/underlays/basewiki/markdown.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/markdown delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/markdown|ikiwiki/markdown]]. Please update
 your links, as this redirection page will be removed in a future ikiwiki

diff --git a/underlays/basewiki/openid.mdwn b/underlays/basewiki/openid.mdwn
index 7fe832e11bcad574c8ff9cb22372953dedce6b0e..5a462c92c04c2ff2ba0152f143412cb7c0a44bb3 100644 (file)
--- a/underlays/basewiki/openid.mdwn
+++ b/underlays/basewiki/openid.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/openid delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/openid|ikiwiki/openid]]. Please update your
 links, as this redirection page will be removed in a future ikiwiki

diff --git a/underlays/basewiki/pagespec.mdwn b/underlays/basewiki/pagespec.mdwn
index 4a82eff841ac4528def83c57ebebd4b8de32f8df..c3caf596c6059a591f4e928c1370eb7e8ba20127 100644 (file)
--- a/underlays/basewiki/pagespec.mdwn
+++ b/underlays/basewiki/pagespec.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/pagespec delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/pagespec|ikiwiki/pagespec]]. Please update
 your links, as this redirection page will be removed in a future ikiwiki

diff --git a/underlays/basewiki/preprocessordirective.mdwn b/underlays/basewiki/preprocessordirective.mdwn
index 7c5d0c3e06c789dc475b3dc2bdee84e0183c5ca2..842ebfb78866cbc00e1d417d8df41d3975839847 100644 (file)
--- a/underlays/basewiki/preprocessordirective.mdwn
+++ b/underlays/basewiki/preprocessordirective.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/preprocessordirective delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to
 [[ikiwiki/preprocessordirective|ikiwiki/preprocessordirective]]. Please

diff --git a/underlays/basewiki/subpage.mdwn b/underlays/basewiki/subpage.mdwn
index 2de27a1ad6460f2fab2f8661198ade3dcc1e2f80..64598b53df4d7b015caa928f52e476bd66a691ae 100644 (file)
--- a/underlays/basewiki/subpage.mdwn
+++ b/underlays/basewiki/subpage.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/subpage delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/subpage|ikiwiki/subpage]]. Please update your
 links, as this redirection page will be removed in a future ikiwiki

diff --git a/underlays/basewiki/wikilink.mdwn b/underlays/basewiki/wikilink.mdwn
index ce5920a571aa6aa75bb22db4408f032dca1e775c..b5a1a8e52828c30065564e7ba952d6f8a62d2a09 100644 (file)
--- a/underlays/basewiki/wikilink.mdwn
+++ b/underlays/basewiki/wikilink.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/wikilink delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/wikilink|ikiwiki/wikilink]]. Please update
 your links, as this redirection page will be removed in a future ikiwiki