diff options
| author | Amitai Schleier <schmonz-web-ikiwiki@schmonz.com> | 2018-04-12 00:07:58 -0400 |
|---|---|---|
| committer | Amitai Schleier <schmonz-web-ikiwiki@schmonz.com> | 2018-04-12 00:08:46 -0400 |
| commit | 643a97359791ba6b85bb1cf1ee49897f369e0fe4 (patch) | |
| tree | c89ed847e8fc37ea5a5f45a0843b05941fb0c204 /doc/forum | |
| parent | 1131585e2a99567c2a9748ad90bb9bd12506350f (diff) | |
| download | ikiwiki-643a97359791ba6b85bb1cf1ee49897f369e0fe4.tar ikiwiki-643a97359791ba6b85bb1cf1ee49897f369e0fe4.tar.gz | |
Revert spam commits.
Diffstat (limited to 'doc/forum')
| -rw-r--r-- | doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn | 2 | ||||
| -rw-r--r-- | doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn b/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn index 1b9f0a039..b8e28e0a3 100644 --- a/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn +++ b/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn @@ -36,7 +36,7 @@ I could not come up with a working set of users which are put into different gro > You can set the umask for ikiwiki itself, without changing the system umask, via the usmask setting in the setup file. --[[Joey]] -In the end, I did the following. I created a directory /srv/ikiwiki/ which is owned by gitosis. The [[setup_file|/Pagina]] is also located there (/srv/ikiwiki/project.setup). I put the srcdir there too (srcdir => '/srv/ikiwiki/project/'). So now sudo -u gitosis ikiwiki --project.setup is able to create the post-update hook (git_wrapper => '/srv/gitosis/repositories/project.git/hooks/post-update'). Since this hook is called every time something is checked in over SSH, it is run by gitosis, so I did not set it suid. Or do I have to, because ikiwiki.cgi will be run as www-data? +In the end, I did the following. I created a directory /srv/ikiwiki/ which is owned by gitosis. The [[setup_file|/usage]] is also located there (/srv/ikiwiki/project.setup). I put the srcdir there too (srcdir => '/srv/ikiwiki/project/'). So now sudo -u gitosis ikiwiki --project.setup is able to create the post-update hook (git_wrapper => '/srv/gitosis/repositories/project.git/hooks/post-update'). Since this hook is called every time something is checked in over SSH, it is run by gitosis, so I did not set it suid. Or do I have to, because ikiwiki.cgi will be run as www-data? > Generally, ikiwiki.cgi is run as the user who owns the wiki and repository, in this case, gitosis. The ikwiiki.cgi needs to be able to write to source files in the wiki; it needs to be able to commit changes, > and it needs to be able to generate and write the html files. If you don't want ikiwiki.cgi to run as gitosis, you will need to put gitosis and www-data in a group and give them both write access, with appropriate umask, etc. --[[Joey]] diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn index 753e18ed2..a8d04a0ad 100644 --- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn +++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn @@ -14,7 +14,7 @@ Thanks, > dest/foo.html, src/bar.mdwn becomes dest/bar.html, etc. > > It sounds like you want `--no-usedirs`, or the corresponding `usedirs => 0,` -> option in your setup file. See [[Pagina]] for more information. -- [[Jon]] +> option in your setup file. See [[usage]] for more information. -- [[Jon]] Thanks, usedirs seems to be just the thing I need. |