diff options
| author | Joey Hess <joey@kitenet.net> | 2010-09-10 13:16:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-09-10 13:16:12 -0400 |
| commit | 5edddf87caf566546c8d8e29c45950ee9408dc0c (patch) | |
| tree | 09ba8dd5eb2a125814e9f0fb28ad690a7391dd41 | |
| parent | fbfda5ccfce40d3f0b5a6076ef02f07e9e5b8fd6 (diff) | |
| parent | 5bee98156aaee2ea796703ecd5df2d4a25e9d9b8 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/forum/using_svn+ssh_with_ikiwiki.mdwn | 9 | ||||
| -rw-r--r-- | doc/rcs/svn/discussion.mdwn | 14 |
2 files changed, 9 insertions, 14 deletions
diff --git a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn new file mode 100644 index 000000000..ce271722c --- /dev/null +++ b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn @@ -0,0 +1,9 @@ +Just as an experiment, I tried running ikiwiki using a remote repository, i.e. via "svn+ssh". After setting up the repo and relocating the working copy, unfortunately, it doesn't work; editing a page gives the error: + +> Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 + +I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --[[Glenn|geychaner@mac.com]] + +> That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey + +A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? --[[Glenn|geychaner@mac.com]] diff --git a/doc/rcs/svn/discussion.mdwn b/doc/rcs/svn/discussion.mdwn index 887b5c4a2..426735182 100644 --- a/doc/rcs/svn/discussion.mdwn +++ b/doc/rcs/svn/discussion.mdwn @@ -11,17 +11,3 @@ can act upon them sequentially, or (2) optionally divorce the `ikiwiki I'm not aware of web servers, at least apache, killing cgi processes when the user stops a page load. If this is happening ikiwiki should be able to avoid it by blocking whatever signal is causing it to terminate. --[[Joey]] - -Just as an experiment, I tried running ikiwiki using a *remote* repository, -i.e. via "svn+ssh". After setting up the repo and relocating the working copy, -unfortunately, it doesn't work; editing a page gives the error: - -Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 - -I *think* this is because, despite a SetEnv directive in the apache configuration, -the CGI wrapper is expunging SVN_SSH from the environment (based on perusing -the source of Wrapper.pm and looking at "envsave" there at the top). -Is this the case? --Glenn - -> That seems likely. You can edit Wrapper.pm and add `SVN_SSH` to the -> `@envsave` list and rebuild your wrappers to test it. --[[Joey]] |