From 473e54703ecd464c8aa0fe23aa668f8cb39b47ba Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 14 Aug 2008 22:22:19 +0200 Subject: Switch to nb locale and ikiwiki_nb.setup in Makefile. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4f3fe1e..b1e52d0 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ikiwiki_MODULES = templates basewiki smiley #ikiwiki_basewiki_FLAVORS = nonedit #ikiwiki_templates_FLAVORS = nonedit # locales used. Expands Git BRANCHes -#ikiwiki_LOCALES = da nb +ikiwiki_LOCALES = nb # gettext-based modules and locales used #ikiwiki_POMODULES = basewiki smiley #ikiwiki_POLOCALES = da @@ -18,7 +18,7 @@ ikiwiki_MODULES = templates basewiki smiley #dummy_MODULES = content_dummy # uncomment this when ikiwiki.setup is configured for the local environment -#CONFIGS = ikiwiki.setup +#CONFIGS = ikiwiki_nb.setup # Everything after this is generic -- cgit v1.2.3 From 520ec5dfe59bdd0beb2d9773603d7e5ff4574d5b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 19 Jul 2010 19:50:40 +0200 Subject: Sync submodules basewiki, javascript, openid-selector, smiley and templates with HEAD of master-da. --- basewiki | 2 +- javascript | 2 +- openid-selector | 2 +- smiley | 2 +- templates | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basewiki b/basewiki index 6b53960..320795e 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit 6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 +Subproject commit 320795e6d83f5d9fa2fefdcdd3f28cf1033243b8 diff --git a/javascript b/javascript index dea1eff..9bf18dd 160000 --- a/javascript +++ b/javascript @@ -1 +1 @@ -Subproject commit dea1eff3d9e9781e5b92a326ad7df17d3ba8ba11 +Subproject commit 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0a diff --git a/openid-selector b/openid-selector index b4852ae..517a71e 160000 --- a/openid-selector +++ b/openid-selector @@ -1 +1 @@ -Subproject commit b4852ae1f1905a285d69947d6352b68983033246 +Subproject commit 517a71e93b14812d722f000ab42a6e61cb7b4027 diff --git a/smiley b/smiley index 30dd469..0f24195 160000 --- a/smiley +++ b/smiley @@ -1 +1 @@ -Subproject commit 30dd469765c2396ded03355876af391e922e89b3 +Subproject commit 0f24195c7ac3858346dff976970b8b21e911242f diff --git a/templates b/templates index 5df058b..ee62a82 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 5df058b2b3dc6e565ad3b3604263f487ef65f2af +Subproject commit ee62a82c4be0125da6b4758e43e231a3c28c857f -- cgit v1.2.3 From 235edae6896d19251dd4f75e5c8f4716340aa250 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 19 Jul 2010 19:54:27 +0200 Subject: Sync submodules basewiki, smiley and templates with HEAD of master-nb, and javascript and openid-selector with HEAD of master-da. --- basewiki | 2 +- javascript | 2 +- openid-selector | 2 +- smiley | 2 +- templates | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basewiki b/basewiki index 6b53960..ef6324a 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit 6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 +Subproject commit ef6324a81724619a7811a964200208f5c808ac10 diff --git a/javascript b/javascript index dea1eff..9bf18dd 160000 --- a/javascript +++ b/javascript @@ -1 +1 @@ -Subproject commit dea1eff3d9e9781e5b92a326ad7df17d3ba8ba11 +Subproject commit 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0a diff --git a/openid-selector b/openid-selector index b4852ae..517a71e 160000 --- a/openid-selector +++ b/openid-selector @@ -1 +1 @@ -Subproject commit b4852ae1f1905a285d69947d6352b68983033246 +Subproject commit 517a71e93b14812d722f000ab42a6e61cb7b4027 diff --git a/smiley b/smiley index 30dd469..0f24195 160000 --- a/smiley +++ b/smiley @@ -1 +1 @@ -Subproject commit 30dd469765c2396ded03355876af391e922e89b3 +Subproject commit 0f24195c7ac3858346dff976970b8b21e911242f diff --git a/templates b/templates index 5df058b..7ece583 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 5df058b2b3dc6e565ad3b3604263f487ef65f2af +Subproject commit 7ece5830013f820325074b5982742aed0f220f48 -- cgit v1.2.3 From a36d509c9e2a00c4999b2684fdcd234a30405d79 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 30 Aug 2010 19:14:52 +0200 Subject: Avoid setting CGI script suid: upsets apache2-suexec. --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 5721896..81e46ec 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -25,7 +25,7 @@ use IkiWiki::Setup::Standard { # cgi wrapper to generate cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.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 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(-) 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