diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-11-08 13:40:54 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-11-08 13:40:54 +0100 |
| commit | ce1b51ea98a42e679fc15c773b6ec98a1a83d761 (patch) | |
| tree | 7b81cc57dd80a12c6922506427a6b48dc6e75ef2 | |
| parent | 44fb5281228a19366184026a1e6ae286c3b345c8 (diff) | |
Merge admin site into regular site.
| -rw-r--r-- | config/ikiwiki_da.setup.in | 8 | ||||
| -rw-r--r-- | config/ikiwiki_da_admin.setup.in | 45 |
2 files changed, 5 insertions, 48 deletions
diff --git a/config/ikiwiki_da.setup.in b/config/ikiwiki_da.setup.in index bd40517..66fb332 100644 --- a/config/ikiwiki_da.setup.in +++ b/config/ikiwiki_da.setup.in @@ -16,11 +16,11 @@ add_plugins: - footer - copyright - linkmap +- attachment +- httpauth disable_plugins: -- editpage -- openid -- recentchanges - passwordauth +- openid discussion: 0 html5: 0 timeformat: '%A d. %e. %B' @@ -28,12 +28,14 @@ locale: da_DK.UTF-8 hardlink: 1 timezone: Europe/Copenhagen allow_symlinks_before_srcdir: 1 +historyurl: 'http://source.sirireiter.dk/?p=bm/content.git;a=history;f=[[file]]' diffurl: http://source.sirireiter.dk/?p=bm/content.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]] #gitorigin_branch: '' gitmaster_branch: master htmlscrubber_skip: '*' locked_pages: '*' multimarkdown: 1 +allowed_attachments: maxsize(2mb) and (*.png or *.gif or *.jpg or *.pdf) typographyattributes: ie tagbase: tag tag_autocreate_commit: 1 diff --git a/config/ikiwiki_da_admin.setup.in b/config/ikiwiki_da_admin.setup.in deleted file mode 100644 index e39066f..0000000 --- a/config/ikiwiki_da_admin.setup.in +++ /dev/null @@ -1,45 +0,0 @@ -# IkiWiki::Setup::Yaml - YAML formatted setup file -wikiname: Birgit Maanestraale -adminemail: siri@jones.dk -adminuser: -- birgit -- siri -- jonas -destdir: '@CURDIR@/build/html-admin' -url: http://admin.birgitmaanestraale.dk/ -cgiurl: http://admin.birgitmaanestraale.dk/ikiwiki.cgi -cgi_wrapper: '@CURDIR@/build/cgi-admin/ikiwiki.cgi' -add_plugins: -- lockedit -- branding -- topbar -- sidebar -- farbar -- footer -- copyright -- linkmap -- attachment -- httpauth -disable_plugins: -- passwordauth -- openid -discussion: 0 -html5: 0 -timeformat: '%A d. %e. %B' -locale: da_DK.UTF-8 -hardlink: 1 -timezone: Europe/Copenhagen -allow_symlinks_before_srcdir: 1 -git_wrapper: '@CURDIR@/build/git-admin/post-update-ikiwiki-admin' -historyurl: 'http://source.sirireiter.dk/?p=bm/content.git;a=history;f=[[file]]' -diffurl: http://source.sirireiter.dk/?p=bm/content.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]] -#gitorigin_branch: '' -gitmaster_branch: master -htmlscrubber_skip: '*' -locked_pages: '*' -multimarkdown: 1 -allowed_attachments: maxsize(2mb) and (*.png or *.gif or *.jpg or *.pdf) -typographyattributes: ie -tagbase: tag -tag_autocreate_commit: 1 -wikistatedir: '@CURDIR@/.ikiwiki-admin' |