Skip to content
Permalink
Browse files

Revert spam commits.

  • Loading branch information...
schmonz committed Apr 12, 2018
1 parent 1131585 commit 643a97359791ba6b85bb1cf1ee49897f369e0fe4
@@ -15,4 +15,4 @@ the ikiwiki.cgi CGI wrapper. ..."
to the user who owns the `source` and `destination` directories.

> (emphasis mine). Anyway, if you have ideas to improve the man page, it's
> over in [[Pagina]] --[[Joey]]
> over in [[usage]] --[[Joey]]
@@ -1,4 +1,4 @@
From the source of [[Pagina]]:
From the source of [[usage]]:

<a href="mailto:joey@ikiwiki.info">&#x6A;&#111;&#101;&#x79;&#64;i&#107;&#105;w&#105;&#107;&#x69;&#46;&#105;n&#x66;&#x6F;</a>

@@ -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]]
@@ -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.

@@ -194,6 +194,7 @@ Personal sites and blogs
* [Salient Dream](http://www.salientdream.com/) - All Things Strange.
* [Anton Berezin's blog](http://blog.tobez.org/)
* [Waldgarten]( http://waldgarten.greenonion.org/ ) News and documentation of a permaculture inspired neighbourhood-garden located in Hamburg, Germany.
* [Frohdo](https://frohdo.de) - With raw food against back pain and other diseases
* [[OscarMorante]]'s [personal site](http://oscar.morante.eu).
* [Puckspage]( http://www.puckspage.org/ ) Political and personal blog in German. The name comes from the elf out of midsummer nights dream.
* [[LucaCapello]]'s [homepage](http://luca.pca.it)
@@ -15,7 +15,7 @@ site generator with some dynamic features.
## using ikiwiki

[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
[[man_page|Pagina]]. There are some [[examples]] of things you can do
[[man_page|usage]]. There are some [[examples]] of things you can do
with ikiwiki, and some [[tips]]. Basic documentation for ikiwiki plugins
and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
discussions.
@@ -7,7 +7,7 @@ There's documentation if you want to [[write]] your own plugins, or you can
[[install]] plugins [[contributed|contrib]] by others.
To enable a plugin, use the `--plugin` switch described in
[[Pagina]], or the equivalent `add_plugins` line in ikiwiki.setup.
[[usage]], or the equivalent `add_plugins` line in ikiwiki.setup.
Enable the [[goodstuff]] plugin to get a nice selection of plugins that
will fit most uses of ikiwiki.
@@ -51,7 +51,7 @@ One setup that will work is to put all committers in a group (say,
"ikiwiki"), and use permissions to allow that group to commit to the bare git
repository. Make both the post-update hook and ikiwiki.cgi be setgid
to the group, as well as suid to the user who admins the wiki. The
`wrappergroup` [[setup_file_option|Pagina]] can be used to make the wrappers
`wrappergroup` [[setup_file_option|usage]] can be used to make the wrappers
be setgid to the right group. Then the srcdir, including its git
repository, should only be writable by the wiki's admin, and *not* by the
group. Take care that ikiwiki uses a umask that does not cause files in
@@ -113,7 +113,7 @@ Alternatively, you can ask ikiwiki to change settings in the file for you:
% ikiwiki --changesetup foo.setup --plugin goodstuff
See [[Pagina]] for more options.
See [[usage]] for more options.
## Customizing file locations
@@ -64,7 +64,7 @@ can copy in files from the [[examples]]. The examples are located in

You can experiment with other ikiwiki parameters such as `--wikiname`
and `--rebuild` too. Get comfortable with its command line (see
[[Pagina]]).
[[usage]]).

## Add a setup file.

@@ -83,7 +83,7 @@ the rest of the files. A good place to put it is in a ~/.ikiwiki/
subdirectory.

Most of the options, like `wikiname` in the setup file are the same as
ikiwiki's command line options (documented in [[Pagina]]). `srcdir` and
ikiwiki's command line options (documented in [[usage]]). `srcdir` and
`destdir` are the two directories you specify when running ikiwiki by
hand. Make sure that these are pointing to the right directories, and
read through and configure the rest of the file to your liking.
File renamed without changes.
File renamed without changes.

0 comments on commit 643a973

Please sign in to comment.
You can’t perform that action at this time.