X-Git-Url: https://sipb.mit.edu/gitweb.cgi/sipb-www.git/blobdiff_plain/8e5f3e0054443172cc204a4a5920ae0952851802..HEAD:/ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index ffb97c2..bdb11ae 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -49,7 +49,7 @@ my %common_setup_args = (
 	# strftime format string to display date
 	timeformat => '%c',
 	# UTF-8 locale to use
-	#locale => 'en_US.UTF-8',
+	locale => 'en_US.UTF-8',
 	# put user pages below specified page
 	userdir => '',
 	# how many backlinks to show before hiding excess (0 to show all)
@@ -111,7 +111,7 @@ my %common_setup_args = (
 	# htmlscrubber plugin
 	# PageSpec specifying pages not to scrub
 	#htmlscrubber_skip => '!*/Discussion',
-	htmlscrubber_skip => 'calendar',
+	htmlscrubber_skip => 'calendar or office',
 
 	# inline plugin
 	# enable rss feeds by default?
@@ -210,7 +210,7 @@ if ($ENV{"IKIWIKI_PREVIEW_OUTPUT"}) {
 		 %common_setup_args,
 		 srcdir => catdir($git_root, "wiki"),
 		 destdir => $ENV{"IKIWIKI_PREVIEW_OUTPUT"},
-		 url => 'http://sipb.mit.edu',
+		 url => 'https://sipb.mit.edu',
 		 templatedir => catdir($ENV{"IKIWIKI_SHARE"}, 'templates'),
 		 underlaydir => catdir($ENV{"IKIWIKI_SHARE"}, 'basewiki'),
 		);
@@ -222,7 +222,7 @@ if ($ENV{"IKIWIKI_PREVIEW_OUTPUT"}) {
 	# where to build the wiki
 	destdir => '/afs/sipb.mit.edu/project/sipb-www/Scripts/wiki',
 	# base url to the wiki
-	url => 'http://sipb.mit.edu',
+	url => 'https://sipb.mit.edu',
 	# url to the ikiwiki.cgi
 	cgiurl => 'https://sipb.mit.edu:444/ikiwiki.cgi',
 	# filename of cgi wrapper to generate