diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | ikiwiki_da.setup (renamed from ikiwiki.setup) | 58 | ||||
| -rw-r--r-- | ikiwiki_da_admin.setup (renamed from ikiwiki_admin.setup) | 60 |
4 files changed, 20 insertions, 107 deletions
@@ -3,14 +3,14 @@ SOURCES = ikiwiki # Git origin (with capital MOULE replaced or stripped as needed) ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE # Git branch (with capital FLAVOR and LOCALE replaced or stripped as needed) -ikiwiki_BRANCH = master-FLAVOR-LOCALE +ikiwiki_BRANCH = allinone-FLAVOR-LOCALE # modules (subproject extension names) used. Expands Git ORIGINs ikiwiki_MODULES = templates basewiki smiley # flavors used. Expands Git BRANCHes ikiwiki_basewiki_FLAVORS = nonedit ikiwiki_templates_FLAVORS = nonedit # locales used. Expands Git BRANCHes -#ikiwiki_LOCALES = da nb +ikiwiki_LOCALES = da # gettext-based modules and locales used #ikiwiki_POMODULES = basewiki smiley #ikiwiki_POLOCALES = da @@ -18,7 +18,7 @@ ikiwiki_templates_FLAVORS = nonedit dummy_MODULES = content_dummy # uncomment this when ikiwiki.setup is configured for the local environment -#CONFIGS = ikiwiki.setup ikiwiki_admin.setup +#CONFIGS = ikiwiki_da.setup ikiwiki_da_admin.setup # Everything after this is generic @@ -8,6 +8,9 @@ the following locales: * danish (da) by Jonas Smedegaard <dr@jones.dk> +Additionally, the configuration has been simplified to not mention non-Git VCS +systems, and deprecated placeholder files has been removed from basewiki. + Getting the source ------------------ diff --git a/ikiwiki.setup b/ikiwiki_da.setup index 5795d32..36221ad 100644 --- a/ikiwiki.setup +++ b/ikiwiki_da.setup @@ -16,19 +16,15 @@ use IkiWiki::Setup::Standard { url => "http://wiki.example.org", cgiurl => "http://wiki.example.org/ikiwiki.cgi", - templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit", + templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/da", underlaydirs => [ $ENV{'HOME'} . "/private_webdata/samplewiki/content", + #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/da", + $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit_l10n/da", ], + # Some plugins (smiley in particular) need non-localized master underlay underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit", - # Subversion stuff. - #rcs => "svn", - #historyurl => "http://svn.example.org/trunk/[[file]]", - #diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]", - #svnrepo => "/svn/wiki", - #svnpath => "trunk", - # Git stuff. #rcs => "git", #historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]]", # ;hb=master @@ -36,32 +32,6 @@ use IkiWiki::Setup::Standard { #gitorigin_branch => "samplewiki", #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/branch/head/filechanges/com.example.branch/[[file]]", - #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", - wrappers => [ #{ # # The cgi wrapper. @@ -70,27 +40,11 @@ use IkiWiki::Setup::Standard { # wrappermode => "06755", #}, #{ - # # 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/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki", - # wrappermode => "06755", - #}, - #{ - # # The monotone netsync hook. - # wrapper => "path/to/root/of/workspace/_MTN/ikiwiki-netsync-hook", + # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-da", # wrappermode => "06755", #}, ], @@ -114,7 +68,7 @@ use IkiWiki::Setup::Standard { # Time format (for strftime) #timeformat => '%c', # 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, # Logging settings: diff --git a/ikiwiki_admin.setup b/ikiwiki_da_admin.setup index eda158d..06278ac 100644 --- a/ikiwiki_admin.setup +++ b/ikiwiki_da_admin.setup @@ -16,16 +16,14 @@ use IkiWiki::Setup::Standard { url => "http://wiki.example.org", cgiurl => "http://wiki.example.org/ikiwiki.cgi", - templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates", + templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_l10n/da", + underlaydirs => [ + #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/da", + $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/da", + ], + # Some plugins (smiley in particular) need non-localized master underlay underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/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]]", - #svnrepo => "/svn/wiki", - #svnpath => "trunk", - # Git stuff. #rcs => "git", #historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]]", # ;hb=master @@ -33,32 +31,6 @@ use IkiWiki::Setup::Standard { #gitorigin_branch => "samplewiki", #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/branch/head/filechanges/com.example.branch/[[file]]", - #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", - wrappers => [ #{ # # The cgi wrapper. @@ -67,27 +39,11 @@ use IkiWiki::Setup::Standard { # wrappermode => "06755", #}, #{ - # # 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/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-admin", - # wrappermode => "06755", - #}, - #{ - # # The monotone netsync hook. - # wrapper => "path/to/root/of/workspace/_MTN/ikiwiki-netsync-hook", + # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-da-admin", # wrappermode => "06755", #}, ], @@ -111,7 +67,7 @@ use IkiWiki::Setup::Standard { # Time format (for strftime) #timeformat => '%c', # 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, # Logging settings: |