From 01a9a12bbfbc21b45c59e4bbc52fbf488776d386 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Sep 2009 13:46:32 -0400 Subject: auto.setup, auto-blog.setup: Fix sanitization of entered wikiname. Closes: #547378 --- auto-blog.setup | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'auto-blog.setup') diff --git a/auto-blog.setup b/auto-blog.setup index 3ef734b39..cf77b3bf7 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -15,6 +15,7 @@ require IkiWiki::Setup::Automator; our $wikiname=IkiWiki::Setup::Automator::ask( gettext("What will the blog be named?"), gettext("blog")); +our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname); our $rcs=IkiWiki::Setup::Automator::ask( gettext("What revision control system to use?"), "git"); our $admin=IkiWiki::Setup::Automator::ask( @@ -27,13 +28,13 @@ IkiWiki::Setup::Automator->import( wikiname => $wikiname, adminuser => [$admin], rcs => $rcs, - srcdir => "$ENV{HOME}/$wikiname", - destdir => "$ENV{HOME}/public_html/$wikiname", - repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs), - dumpsetup => "$ENV{HOME}/$wikiname.setup", - url => "http://$domain/~$ENV{USER}/$wikiname", - cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi", - cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi", + srcdir => "$ENV{HOME}/$wikiname_short", + destdir => "$ENV{HOME}/public_html/$wikiname_short", + repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), + dumpsetup => "$ENV{HOME}/$wikiname_short.setup", + url => "http://$domain/~$ENV{USER}/$wikiname_short", + cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", add_plugins => [qw{goodstuff websetup comments blogspam}], disable_plugins => [qw{}], -- cgit v1.2.3 From 037d5d5296ad0073a1acbb05c4cfd6461b49d1fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Oct 2009 13:55:44 -0400 Subject: fix case --- auto-blog.setup | 2 +- auto.setup | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'auto-blog.setup') diff --git a/auto-blog.setup b/auto-blog.setup index cf77b3bf7..82aa8d415 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -21,7 +21,7 @@ our $rcs=IkiWiki::Setup::Automator::ask( our $admin=IkiWiki::Setup::Automator::ask( gettext("What wiki user (or openid) will be admin?"), $ENV{USER}); use Net::Domain q{hostfqdn}; -our $domain=hostfqdn() || ikiwiki::setup::automator::ask( +our $domain=hostfqdn() || IkiWiki::Setup::Automator::ask( gettext("What is the domain name of the web server?"), ""); IkiWiki::Setup::Automator->import( diff --git a/auto.setup b/auto.setup index dc2b19992..afb54b324 100644 --- a/auto.setup +++ b/auto.setup @@ -20,7 +20,7 @@ our $rcs=IkiWiki::Setup::Automator::ask( our $admin=IkiWiki::Setup::Automator::ask( gettext("Which user (wiki account or openid) will be admin?"), $ENV{USER}); use Net::Domain q{hostfqdn}; -our $domain=hostfqdn() || ikiwiki::setup::automator::ask( +our $domain=hostfqdn() || IkiWiki::Setup::Automator::ask( gettext("What is the domain name of the web server?"), ""); IkiWiki::Setup::Automator->import( -- cgit v1.2.3 From eda1d1321b7510d717c236b668e430bf1f656bed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 6 Feb 2010 15:53:54 -0500 Subject: auto-blog.setup: Lock all pages, so only admin can post to the blog by default. --- auto-blog.setup | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) (limited to 'auto-blog.setup') diff --git a/auto-blog.setup b/auto-blog.setup index 82aa8d415..e3059e32e 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -47,4 +47,5 @@ IkiWiki::Setup::Automator->import( comments_pagespec => "posts/* and !*/Discussion", blogspam_pagespec => "postcomment(*)", discussion => 0, + locked_pages => "*", ) diff --git a/debian/changelog b/debian/changelog index e07bada28..b4acac633 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low ikiwiki.cgi?do=register * Improve display of openid in preferences page. * Add link to userpage (or creation link) to top of preferences page. + * auto-blog.setup: Lock all pages, so only admin can post to the blog + by default. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From caa5db6c54c5c6368d511214961e749f5451379c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 6 Feb 2010 16:20:03 -0500 Subject: add opendiscussion to auto-blog.setup --- auto-blog.setup | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'auto-blog.setup') diff --git a/auto-blog.setup b/auto-blog.setup index e3059e32e..7ff413187 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import( cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", - add_plugins => [qw{goodstuff websetup comments blogspam}], + add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam}], disable_plugins => [qw{}], libdir => "$ENV{HOME}/.ikiwiki", rss => 1, diff --git a/debian/changelog b/debian/changelog index a65592277..794dec418 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,10 +8,10 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low ikiwiki.cgi?do=register * Improve display of openid in preferences page. * Add link to userpage (or creation link) to top of preferences page. - * auto-blog.setup: Lock all pages, so only admin can post to the blog - by default. * opendiscussion: This plugin will also now allow posting comments to otherwise locked-down sites. + * auto-blog.setup: Lock all pages, so only admin can post to the blog + by default, and enable opendiscussion so others can comment. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From 6e7bfbe7bb8ba4b94d0e8c203b2117477b217384 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 28 Mar 2010 19:23:34 -0400 Subject: auto-blog.setup: Set tagbase by default, since most bloggers will want it. Also modified first_post page to use a tag format that will work whether or not tagbase is set. --- auto-blog.setup | 1 + debian/changelog | 1 + doc/examples/blog/posts/first_post.mdwn | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'auto-blog.setup') diff --git a/auto-blog.setup b/auto-blog.setup index 7ff413187..95347167f 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -48,4 +48,5 @@ IkiWiki::Setup::Automator->import( blogspam_pagespec => "postcomment(*)", discussion => 0, locked_pages => "*", + tagbase => "tags", ) diff --git a/debian/changelog b/debian/changelog index 57406c6d3..2d82c4dba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low that could lead to bad dependency handling in certian situations. * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar if necessary for unusual install. + * auto-blog.setup: Set tagbase by default, since most bloggers will want it. -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn index d49432341..7f814fbb1 100644 --- a/doc/examples/blog/posts/first_post.mdwn +++ b/doc/examples/blog/posts/first_post.mdwn @@ -1,4 +1,4 @@ This is the first post to this example blog. To add new posts, just add files to the posts/ subdirectory, or use the web form. -[[!tag tags/tech]] +[[!tag ./tags/tech]] -- cgit v1.2.3 From c50d218916d28f6ee1f1ad2b2280e4dd8c90dc1b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Apr 2010 15:31:18 -0400 Subject: enable calendar by default Makes it a bit easier to include the calendar on the sidebar template. --- auto-blog.setup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'auto-blog.setup') diff --git a/auto-blog.setup b/auto-blog.setup index 95347167f..0a2a81bf7 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import( cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", - add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam}], + add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar}], disable_plugins => [qw{}], libdir => "$ENV{HOME}/.ikiwiki", rss => 1, @@ -46,6 +46,7 @@ IkiWiki::Setup::Automator->import( example => "blog", comments_pagespec => "posts/* and !*/Discussion", blogspam_pagespec => "postcomment(*)", + archive_pagespec => "posts/* and !*/Discussion", discussion => 0, locked_pages => "*", tagbase => "tags", -- cgit v1.2.3 From adbbd014dc76f334ed897f6801afa4cb0b483864 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Apr 2010 16:52:41 -0400 Subject: Enable calendar and sidebar in auto-blog.setup. --- auto-blog.setup | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'auto-blog.setup') diff --git a/auto-blog.setup b/auto-blog.setup index 0a2a81bf7..ff52befa3 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import( cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", - add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar}], + add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar sidebar}], disable_plugins => [qw{}], libdir => "$ENV{HOME}/.ikiwiki", rss => 1, diff --git a/debian/changelog b/debian/changelog index 267a2fd7a..af19f4a00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low * CSS and templates for sidebar changed to use a class, not an id. * sidebar: Now a sidebar directive can be used to override the sidebar shown on a page. + * Enable calendar and sidebar in auto-blog.setup. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 -- cgit v1.2.3 From d7c164dbf29ef57f8ed2963985bd250acbef96df Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Apr 2010 17:32:11 -0400 Subject: disable global sidebars by default --- auto-blog.setup | 1 + 1 file changed, 1 insertion(+) (limited to 'auto-blog.setup') diff --git a/auto-blog.setup b/auto-blog.setup index ff52befa3..ef03295d6 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -47,6 +47,7 @@ IkiWiki::Setup::Automator->import( comments_pagespec => "posts/* and !*/Discussion", blogspam_pagespec => "postcomment(*)", archive_pagespec => "posts/* and !*/Discussion", + global_sidebars => 0, discussion => 0, locked_pages => "*", tagbase => "tags", -- cgit v1.2.3 From d541cc854a6e610d2d9f5f7b950f4abb76e36954 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 15 Jun 2010 13:38:19 -0400 Subject: calendar: Tune archive_pagespec to only match pages, not other files. --- IkiWiki/Plugin/calendar.pm | 2 +- auto-blog.setup | 2 +- debian/changelog | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'auto-blog.setup') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 359c9b861..bb995d499 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -49,7 +49,7 @@ sub getsetup () { }, archive_pagespec => { type => "pagespec", - example => "posts/* and !*/Discussion", + example => "page(posts/*) and !*/Discussion", description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command", link => 'ikiwiki/PageSpec', safe => 1, diff --git a/auto-blog.setup b/auto-blog.setup index ef03295d6..980074ec3 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -46,7 +46,7 @@ IkiWiki::Setup::Automator->import( example => "blog", comments_pagespec => "posts/* and !*/Discussion", blogspam_pagespec => "postcomment(*)", - archive_pagespec => "posts/* and !*/Discussion", + archive_pagespec => "page(posts/*) and !*/Discussion", global_sidebars => 0, discussion => 0, locked_pages => "*", diff --git a/debian/changelog b/debian/changelog index 32ba0cf08..bddedeafa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low * websetup: Allow enabling plugins listed in disable_plugins. * editpage, comments: Fix broken links in sidebar (due to forcebaseurl). (Thanks, privat) + * calendar: Tune archive_pagespec to only match pages, not other files. -- Joey Hess Fri, 11 Jun 2010 13:39:15 -0400 -- cgit v1.2.3