Merge remote-tracking branch 'schmonz/proxy'

Conflicts:
	doc/todo/outbound_proxy.mdwn
	doc/users/schmonz.mdwn

diff --git a/doc/plugins/contrib/dynamiccookies.mdwn b/doc/plugins/contrib/dynamiccookies.mdwn
deleted file mode 100644 (file)
index c43b18f..0000000
--- a/doc/plugins/contrib/dynamiccookies.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!template id=plugin name=dynamiccookies author="[[schmonz]]"]]
-[[!template id=gitbranch branch=schmonz/dynamiccookies author="[[schmonz]]"]]
-[[!tag type/web]]
-
-This plugin populates ikiwiki's cookiejar by calling an external
-program. The program is expected to print the serialized cookies
-on `stdout` in a form which can be `eval`'d (e.g., `Data::Dumper`).
-
-The plugin author's use case for this seemingly hacky interface:
-aggregating authenticated feeds at work, where for various reasons
-the needed cookies must be acquired using a separate `perl` from
-the one used by ikiwiki.

diff --git a/doc/todo/outbound_proxy.mdwn b/doc/todo/outbound_proxy.mdwn
index 9159a1af152838424bc73a00165e85ba228ffd01..856a92a12bd5bd64beee59834ccea99f7a83f608 100644 (file)
--- a/doc/todo/outbound_proxy.mdwn
+++ b/doc/todo/outbound_proxy.mdwn
@@ -12,7 +12,8 @@ Ikiwiki has several plugins that open outbound connections:
 In some networks it is desired (or necessary) for these connections
 to traverse a proxy. Proxies are usually configured via environment
 variables, so for ikiwiki it is probably not desirable (or necessary)
-to manage proxy configuration in the setup file.
+to manage proxy configuration via new purpose-specific settings in
+the setup file; `ENV` ought to suffice.
 
 [[!cpan LWP::UserAgent]] by default doesn't care about the usual
 environment variables, but if its constructor is passed a true
@@ -47,3 +48,8 @@ know whether its paranoia measures up or whether it supports proxies.
 
 * [[bugs/http_proxy_for_openid]]
 * [[forum/Setting_http__95__proxy]]
+
+> This looks fine, but you forgot to move the config entry for cookiejar
+> from aggregate to the config setting list in IkiWiki.pm --[[Joey]] 
+
+>> Indeed, fixed. --[[schmonz]]