diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | README | 19 | ||||
| -rw-r--r-- | ikiwiki.admin.setup | 159 | ||||
| -rw-r--r-- | ikiwiki.setup | 47 |
5 files changed, 210 insertions, 38 deletions
@@ -4,3 +4,5 @@ /smiley_l10n /templates /templates_l10n +/content +/content_dummy @@ -1,16 +1,21 @@ -SOURCES = ikiwiki +SOURCES = ikiwiki ikiwiki-scs sukker ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE -ikiwiki_MODULES = templates basewiki smiley -ikiwiki_POMODULES = smiley -ikiwiki_BRANCH = master-LOCALE -ikiwiki_LOCALES = da no_NB -#ikiwiki_POLOCALES = da +ikiwiki_MODULES = smiley +ikiwiki_BRANCH = master-da -#dummy_MODULES = content_dummy +ikiwiki-scs_ORIGIN = git://source.jones.dk/ikiwiki_MODULE +ikiwiki-scs_MODULES = templates basewiki +ikiwiki-scs_BRANCH = scs-da + +sukker_ORIGIN = git://source.jones.dk/sukker_MODULE +sukker_MODULES = content +sukker_BRANCH = master + +dummy_MODULES = content_dummy # uncomment this when ikiwiki.setup is configured for the local environment -#CONFIGS = ikiwiki.setup +CONFIGS = ikiwiki.setup ikiwiki.admin.setup # Everything after this is generic @@ -1,10 +1,11 @@ -Ikiwiki w/ translations -======================= +Website for project Sukker +========================== -Ikiwiki[1] is a perl-based wiki compiler. +This is the source of the web environment for the website located at +http://sukker.biks.dk . -This is routines to manage translatable parts of Ikiwiki and translations into -the following locales: +The system is built with the Ikiwiki[1] wiki compiler, using the +following locales: * danish (da) by Jonas Smedegaard <dr@jones.dk> @@ -15,7 +16,7 @@ Getting the source This README file is available at http://source.jones.dk/ together with a GIT repository with source of the translation routines. Pull it like this: - git clone git://source.jones.dk/ikiwiki + git clone git://source.jones.dk/sukker Installation @@ -28,7 +29,7 @@ To pull in all translatable and translated parts, do this: If you have write access to one or more GIT repositories, you can override their locations like this: - make ikiwiki_ORIGIN=debian@source.jones.dk:/srv/git/source.jones.dk/ikiwiki_MODULE.git + make sukker_ORIGIN=debian@source.jones.dk:/srv/git/source.jones.dk/sukker_MODULE.git To remove all translatable and translated parts, and anything else below those directories without warning, do this: @@ -66,8 +67,8 @@ and push it all - like this for repository with master and master-da branches: To resyncronize an older fork of the repository with newer upstream changes, do like this (skip first command on subsequent updates): - git remote add ikiwiki git://source.jones.dk/ikiwiki - git pull ikiwiki master + git remote add sukker git://source.jones.dk/sukker + git pull sukker master Translation diff --git a/ikiwiki.admin.setup b/ikiwiki.admin.setup new file mode 100644 index 0000000..531e787 --- /dev/null +++ b/ikiwiki.admin.setup @@ -0,0 +1,159 @@ +#!/usr/bin/perl +# Configuration file for ikiwiki. +# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and +# build the wiki. +# +# Remember to re-run ikiwiki --setup any time you edit this file. + +use IkiWiki::Setup::Standard { + wikiname => "Sukker", + adminuser => ["jonas", ], + adminemail => 'webmaster@jones.dk', + + # Be sure to customise these.. + srcdir => $ENV{'HOME'} . "/private_webdata/sukker/content", + destdir => $ENV{'HOME'} . "/public_websites/admin.sukker.biks.dk", + + url => "https://admin.sukker.biks.dk", + cgiurl => "https://admin.sukker.biks.dk/ikiwiki.cgi", + templatedir => $ENV{'HOME'} . "/private_webdata/sukker/templates", + underlaydir => $ENV{'HOME'} . "/private_webdata/sukker/basewiki", + + # Subversion stuff. + #rcs => "svn", + #historyurl => "http://svn.example.org/trunk/[[file]]", + #diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]", + #svnpath => "trunk", + + # Git stuff. + rcs => "git", + #historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]", + #diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]", + #gitorigin_branch => "origin", + #gitmaster_branch => "master", + + # Tla stuff. + #rcs => "tla" + #historyurl => ??, + #diffurl => ??, + + # Mercurial stuff. + #rcs => "mercurial", + #historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository + #diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]", + + # Bazaar stuff. + #rcs => "bzr", + #historyurl => "", + #diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead + + # Monotone stuff + #rcs => "monotone", + #mtnkey => "web\@machine.company.com", + #historyurl => "http://viewmtn.example.com/", + #diffurl => "http://viewmtn.example.com/revision/diff/[[r1]]/with/[[r2]]/[[file]]", + # Set if you want the wiki to sync on update and commit. + #mtnsync => 0, + # The path to your workspace (defaults to the srcdir itself) + # e.g. use if your srcdir is a subdirectory of the workspace. + #mtnrootdir => "path/to/root/of/workspace", + # This is a monotone lua hook file used by ikiwiki for + # inserting conflict markers. By default it will use + # mtnrootdir/_MTN/mergerc. This hook will be populated with + # default code the first time you use ikiwiki. You can + # change it to alter how conflict markers are inserted. + #mtnmergerc => "path/to/mergerc", + + wrappers => [ + { + # # The cgi wrapper. + cgi => 1, + wrapper => $ENV{'HOME'} . "/public_cgi/admin.sukker.biks.dk/ikiwiki.cgi", + wrappermode => "00500", + }, + #{ + # # The svn post-commit wrapper. + # # Note that this will overwrite any existing + # # post-commit hook script, which may not be + # # what you want. + # wrapper => "/svn/wikirepo/hooks/post-commit", + # wrappermode => "04755", + # # Log to syslog since svn post-commit hooks + # # hide output and errors. + # syslog => 1, + #}, + { + # # The git post-update wrapper. + # # Note that this will overwrite any existing + # # post-update hook script, which may not be + # # what you want. + wrapper => $ENV{'HOME'} . "/public_websites/source.jones.dk/sukker_content.git/hooks/post-update-sukker-admin", + wrappermode => "06755", + }, + ], + + # Default to generating rss feeds for blogs? + rss => 1, + # Default to generating atom feeds for blogs? + atom => 1, + # Allow generating feeds even if not generated by default? + #allowrss => 1, + #allowatom => 1, + # Urls to ping with XML-RPC when rss feeds are updated + #pingurl => [qw{http://rpc.technorati.com/rpc/ping}], + # Include discussion links on all pages? + discussion => 1, + # To exclude files matching a regexp from processing. This adds to + # the default exclude list. + #exclude => qr/*\.wav/, + # To change the extension used for generated html files. + #htmlext => 'htm', + # Time format (for strftime) + timeformat => '%A d. %e. %B kl. %R (dansk tid)"', + # Locale to use. Must be a UTF-8 locale. + locale => 'da_DK.UTF-8', + # Only send cookies over SSL connections. + sslcookie => 1, + # Logging settings: + #verbose => 1, + syslog => 0, + # To link to user pages in a subdirectory of the wiki. + #userdir => "users", + # To create output files named page.html rather than page/index.html. + #usedirs => 0, + # Simple spam prevention: require an account-creation password. + #account_creation_password => "example", + # Uncomment to force ikiwiki to run with a particular umask. + #umask => 022, + # Default settings for the recentchanges page. + #recentchangespage => "recentchanges", + #recentchangesnum => 100, + + # To add plugins, list them here. + add_plugins => [qw{goodstuff search typography sidebar favicon graphviz editdiff}], + # If you want to disable any of the default plugins, list them here. + disable_plugins => [qw{openid}], + # To add a directory to the perl search path, use this. + libdir => "/home/debian/private_webdata/sukker/perl", + + # For use with the tag plugin, make all tags be located under a + # base page. + #tagbase => "tag", + + # For use with the search plugin if your estseek.cgi is located + # somewhere else. + #estseek => "/usr/lib/estraier/estseek.cgi", + + # For use with the openid plugin, to give an url to a page users + # can use to signup for an OpenID. + #openidsignup => "http://myopenid.com/", + + # For use with the mirrorlist plugin, a list of mirrors. + #mirrorlist => { + # mirror1 => "http://hostname1", + # mirror2 => "http://hostname2/mirror", + #}, + + # Avoid english-only Text::Typography hyphen conversion + typographyattributes => 'ie', +} diff --git a/ikiwiki.setup b/ikiwiki.setup index c96a45f..90e36e3 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -6,18 +6,21 @@ # Remember to re-run ikiwiki --setup any time you edit this file. use IkiWiki::Setup::Standard { - wikiname => "MyWiki", + wikiname => "Sukker", #adminuser => ["yourname", ], - adminemail => 'me@example.org', + adminemail => 'webmaster@jones.dk', # Be sure to customise these.. - srcdir => "/path/to/source", - destdir => "/var/www/wiki", + srcdir => $ENV{'HOME'} . "/private_webdata/sukker/content_dummy", + destdir => $ENV{'HOME'} . "/public_websites/sukker.biks.dk", - url => "http://example.org/wiki", - cgiurl => "http://example.org/ikiwiki.cgi", - #templatedir => "/usr/share/ikiwiki/templates", - #underlaydir => "/usr/share/ikiwiki/basewiki", + url => "http://sukker.biks.dk", + #cgiurl => "http://example.org/ikiwiki.cgi", + templatedir => $ENV{'HOME'} . "/private_webdata/sukker/templates", + underlaydirs => [ + $ENV{'HOME'} . "/private_webdata/sukker/content", + ], + underlaydir => $ENV{'HOME'} . "/private_webdata/sukker/basewiki", # Subversion stuff. #rcs => "svn", @@ -26,7 +29,7 @@ use IkiWiki::Setup::Standard { #svnpath => "trunk", # Git stuff. - #rcs => "git", + rcs => "git", #historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]", #diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]", #gitorigin_branch => "origin", @@ -82,14 +85,14 @@ use IkiWiki::Setup::Standard { # # hide output and errors. # syslog => 1, #}, - #{ + { # # The git post-update wrapper. # # Note that this will overwrite any existing # # post-update hook script, which may not be # # what you want. - # wrapper => "/git/wiki.git/hooks/post-update", - # wrappermode => "06755", - #}, + wrapper => $ENV{'HOME'} . "/public_websites/source.jones.dk/sukker_content.git/hooks/post-update-sukker", + wrappermode => "06755", + }, ], # Default to generating rss feeds for blogs? @@ -102,18 +105,18 @@ use IkiWiki::Setup::Standard { # Urls to ping with XML-RPC when rss feeds are updated #pingurl => [qw{http://rpc.technorati.com/rpc/ping}], # Include discussion links on all pages? - discussion => 1, + discussion => 0, # To exclude files matching a regexp from processing. This adds to # the default exclude list. #exclude => qr/*\.wav/, # To change the extension used for generated html files. #htmlext => 'htm', # Time format (for strftime) - #timeformat => '%c', + timeformat => '%A d. %e. %B kl. %R (dansk tid)', # Locale to use. Must be a UTF-8 locale. - #locale => 'en_US.UTF-8', + locale => 'da_DK.UTF-8', # Only send cookies over SSL connections. - #sslcookie => 1, + sslcookie => 1, # Logging settings: #verbose => 1, syslog => 0, @@ -130,12 +133,11 @@ use IkiWiki::Setup::Standard { #recentchangesnum => 100, # To add plugins, list them here. - #add_plugins => [qw{goodstuff search wikitext camelcase - # htmltidy fortune sidebar map rst anonok}], + add_plugins => [qw{goodstuff typography sidebar favicon graphviz}], # If you want to disable any of the default plugins, list them here. - #disable_plugins => [qw{inline htmlscrubber passwordauth openid}], + disable_plugins => [qw{openid recentchanges}], # To add a directory to the perl search path, use this. - #libdir => "/home/me/.ikiwiki/", + libdir => "/home/debian/private_webdata/sukker/perl", # For use with the tag plugin, make all tags be located under a # base page. @@ -154,4 +156,7 @@ use IkiWiki::Setup::Standard { # mirror1 => "http://hostname1", # mirror2 => "http://hostname2/mirror", #}, + + # Avoid english-only Text::Typography hyphen conversion + typographyattributes => 'ie', } |