From 05d3d86705d650215d2d6324932dd0554faa5b17 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 15 Aug 2008 01:02:45 +0200 Subject: Fix use locale-specific Git hook. --- ikiwiki_nb.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ikiwiki_nb.setup') diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 295f618..44f8f35 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -87,7 +87,7 @@ use IkiWiki::Setup::Standard { # # Note that this will overwrite any existing # # post-update hook script, which may not be # # what you want. - # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki", + # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb", # wrappermode => "06755", #}, #{ -- cgit v1.2.3 From 1e79fb9bbee7c035892759ca130ec6f37157fe3d Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Jul 2010 23:26:52 +0200 Subject: Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_nb.config. --- ikiwiki_nb.setup | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'ikiwiki_nb.setup') diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 1b43923..12a5b94 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -33,13 +33,8 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_l10n/nb', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', # base wiki source location - underlaydirs => [ - #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb", - $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/nb", - ], - # Some plugins (smiley in particular) need non-localized master underlay underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki', # display verbose messages when building? #verbose => 1, -- cgit v1.2.3 From ddc04a894c5aab7189aa785a172dece9d7d57bdf Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 30 Aug 2010 19:18:44 +0200 Subject: Avoid setting CGI script suid: upsets apache2-suexec. --- ikiwiki_da.setup | 2 +- ikiwiki_nb.setup | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ikiwiki_nb.setup') diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 44e84ff..008197b 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -25,7 +25,7 @@ use IkiWiki::Setup::Standard { # cgi wrapper to generate cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.da.cgi', # mode for cgi_wrapper (can safely be made suid) - cgi_wrappermode => '06755', + cgi_wrappermode => '00755', # rcs backend to use rcs => '', # plugins to add to the default configuration diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 17886ac..4d84eb8 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -25,7 +25,7 @@ use IkiWiki::Setup::Standard { # cgi wrapper to generate cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.nb.cgi', # mode for cgi_wrapper (can safely be made suid) - cgi_wrappermode => '06755', + cgi_wrappermode => '00755', # rcs backend to use rcs => '', # plugins to add to the default configuration -- cgit v1.2.3