From 5e790591bfb9d226eaf6fff38fc819b37f3d30cb Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 19 Oct 2010 23:35:22 +0000 Subject: [PATCH 001/114] initial commit of setup files --- .gitignore | 7 + ikiwiki.setup | 417 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 424 insertions(+) create mode 100644 .gitignore create mode 100644 ikiwiki.setup diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..a53012f97f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +.ikiwiki +public_html +source +source.git +logs +.ikisite-nonce +.gitconfig diff --git a/ikiwiki.setup b/ikiwiki.setup new file mode 100644 index 0000000000..e30a07ee7c --- /dev/null +++ b/ikiwiki.setup @@ -0,0 +1,417 @@ +# IkiWiki::Setup::Yaml - YAML formatted setup file +# +# Setup 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. +# +# name of the wiki +wikiname: git-annex +# contact email for wiki +adminemail: joey@kitenet.net +# users who are wiki admins +adminuser: + - http://none/ +# users who are banned from the wiki +banned_users: [] +# where the source of the wiki is located +srcdir: /home/b-git-annex/source +# where to build the wiki +destdir: /home/b-git-annex/public_html +# base url to the wiki +url: http://git-annex.branchable.com +# url to the ikiwiki.cgi +cgiurl: http://git-annex.branchable.com/ikiwiki.cgi +# filename of cgi wrapper to generate +cgi_wrapper: /home/b-git-annex/public_html/ikiwiki.cgi +# mode for cgi_wrapper (can safely be made suid) +cgi_wrappermode: 06755 +# rcs backend to use +rcs: git +# plugins to add to the default configuration +add_plugins: + - goodstuff + - websetup + - 404 + - ikiwikihosting + - branchable + - recentchangesdiff + - attachment + - remove + - rename + - edittemplate + - favicon + - format + - fortune + - highlight + - listdirectives + - poll + - progress + - relativedate + - search + - testpagespec + - version + - theme +# plugins to disable +disable_plugins: [] +# additional directory to search for template files +templatedir: /usr/share/ikiwiki/templates +# base wiki source location +underlaydir: /usr/share/ikiwiki/basewiki +# display verbose messages? +#verbose: 1 +# log to syslog? +syslog: 1 +# create output files named page/index.html? +usedirs: 1 +# use '!'-prefixed preprocessor directives? +prefix_directives: 1 +# use page/index.mdwn source files +indexpages: 0 +# enable Discussion pages? +discussion: 1 +# name of Discussion pages +discussionpage: Discussion +# generate HTML5? (experimental) +html5: 0 +# only send cookies over SSL connections? +sslcookie: 0 +# extension to use for new pages +default_pageext: mdwn +# extension to use for html files +htmlext: html +# strftime format string to display date +timeformat: '%c' +# UTF-8 locale to use +#locale: en_US.UTF-8 +# put user pages below specified page +userdir: '' +# how many backlinks to show before hiding excess (0 to show all) +numbacklinks: 10 +# attempt to hardlink source files? (optimisation for large files) +hardlink: 1 +# force ikiwiki to use a particular umask +#umask: 022 +# group for wrappers to run in +#wrappergroup: ikiwiki +# extra library and plugin directory +libdir: /home/b-git-annex/.ikiwiki +# environment variables +ENV: {} +# regexp of normally excluded files to include +#include: '^\.htaccess$' +# regexp of files that should be skipped +#exclude: '^(*\.private|Makefile)$' +# specifies the characters that are allowed in source filenames +wiki_file_chars: '-[:alnum:]+/.:_' +# allow symlinks in the path leading to the srcdir (potentially insecure) +allow_symlinks_before_srcdir: 0 + +###################################################################### +# core plugins +# (branchable, editpage, git, htmlscrubber, inline, link, meta, +# parentlinks) +###################################################################### + +# branchable plugin +# Allow anyone to branch, check out, and copy this site? +branchable: 1 +# Display "Branchable" link on action bar? +#branchable_action: 1 + +# git plugin +# git hook to generate +git_wrapper: /home/b-git-annex/source.git/hooks/post-update +# shell command for git_wrapper to run, in the background +#git_wrapper_background_command: git push github +# mode for git_wrapper (can safely be made suid) +#git_wrappermode: 06755 +# git pre-receive hook to generate +#git_test_receive_wrapper: /git/wiki.git/hooks/pre-receive +# unix users whose commits should be checked by the pre-receive hook +#untrusted_committers: [] +# gitweb url to show file history ([[file]] substituted) +historyurl: 'http://source.git-annex.branchable.com/?p=source.git;a=history;f=[[file]];hb=HEAD' +# gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted) +diffurl: 'http://source.git-annex.branchable.com/?p=source.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]' +# where to pull and push changes (set to empty string to disable) +#gitorigin_branch: origin +# branch that the wiki is stored in +#gitmaster_branch: master + +# htmlscrubber plugin +# PageSpec specifying pages not to scrub +#htmlscrubber_skip: '!*/Discussion' + +# inline plugin +# enable rss feeds by default? +rss: 1 +# enable atom feeds by default? +atom: 1 +# allow rss feeds to be used? +#allowrss: 0 +# allow atom feeds to be used? +#allowatom: 0 +# urls to ping (using XML-RPC) on feed update +#pingurl: http://rpc.technorati.com/rpc/ping + +###################################################################### +# auth plugins +# (anonok, blogspam, httpauth, lockedit, moderatedcomments, +# opendiscussion, openid, passwordauth, signinedit) +###################################################################### + +# anonok plugin +# PageSpec to limit which pages anonymous users can edit +#anonok_pagespec: '*/discussion' + +# blogspam plugin +# PageSpec of pages to check for spam +#blogspam_pagespec: postcomment(*) +# options to send to blogspam server +#blogspam_options: 'blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10' +# blogspam server XML-RPC url +#blogspam_server: '' + +# httpauth plugin +# url to redirect to when authentication is needed +#cgiauthurl: http://example.com/wiki/auth/ikiwiki.cgi +# PageSpec of pages where only httpauth will be used for authentication +#httpauth_pagespec: '!*/Discussion' + +# lockedit plugin +# PageSpec controlling which pages are locked +#locked_pages: '!*/Discussion' + +# moderatedcomments plugin +# PageSpec matching users or comment locations to moderate +#moderate_pagespec: '*' + +# openid plugin +# url pattern of openid realm (default is cgiurl) +openid_realm: http://*.branchable.com/ +# url to ikiwiki cgi to use for openid authentication (default is cgiurl) +openid_cgiurl: http://git-annex.branchable.com/ikiwiki.cgi + +# passwordauth plugin +# a password that must be entered when signing up for an account +#account_creation_password: s3cr1t +# cost of generating a password using Authen::Passphrase::BlowfishCrypt +#password_cost: 8 + +###################################################################### +# format plugins +# (creole, highlight, hnb, html, mdwn, otl, po, rawhtml, rst, textile, +# txt) +###################################################################### + +# highlight plugin +# types of source files to syntax highlight +tohighlight: .c .h .cpp .pl .py Makefile:make +# location of highlight's filetypes.conf +#filetypes_conf: /etc/highlight/filetypes.conf +# location of highlight's langDefs directory +#langdefdir: /usr/share/highlight/langDefs + +# mdwn plugin +# enable multimarkdown features? +#multimarkdown: 0 + +# po plugin +# master language (non-PO files) +#po_master_language: en|English +# slave languages (translated via PO files) format: ll|Langname +#po_slave_languages: +# - fr|Français +# - es|Español +# - de|Deutsch +# PageSpec controlling which pages are translatable +#po_translatable_pages: '* and !*/Discussion' +# internal linking behavior (default/current/negotiated) +#po_link_to: current + +###################################################################### +# misc plugins +# (filecheck) +###################################################################### + +###################################################################### +# web plugins +# (404, attachment, comments, editdiff, edittemplate, getsource, google, +# goto, mirrorlist, remove, rename, repolist, search, theme, websetup, +# wmd) +###################################################################### + +# attachment plugin +# enhanced PageSpec specifying what attachments are allowed +allowed_attachments: admin() and virusfree() +# virus checker program (reads STDIN, returns nonzero if virus found) +virus_checker: clamdscan - + +# comments plugin +# PageSpec of pages where comments are allowed +#comments_pagespec: blog/* and !*/Discussion +# PageSpec of pages where posting new comments is not allowed +#comments_closed_pagespec: blog/controversial or blog/flamewar +# Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" +#comments_pagename: '' +# Interpret directives in comments? +#comments_allowdirectives: 0 +# Allow anonymous commenters to set an author name? +#comments_allowauthor: 0 +# commit comments to the VCS +#comments_commit: 1 + +# getsource plugin +# Mime type for returned source. +#getsource_mimetype: text/plain; charset=utf-8 + +# mirrorlist plugin +# list of mirrors +#mirrorlist: {} + +# repolist plugin +# URIs of repositories containing the wiki's source +#repositories: +# - svn://svn.example.org/wiki/trunk + +# search plugin +# path to the omega cgi program +#omega_cgi: /usr/lib/cgi-bin/omega/omega + +# theme plugin +# name of theme to enable +#theme: actiontabs + +# websetup plugin +# list of plugins that cannot be enabled/disabled via the web interface +websetup_force_plugins: + - httpauth + - openid + - mdwn + - wmd +# list of additional setup field keys to treat as unsafe +websetup_unsafe: + - url + - cgiurl + - verbose + - syslog + - usedirs + - prefix_directives + - indexpages + - repositories +# show unsafe settings, read-only, in web interface? +websetup_show_unsafe: 0 + +###################################################################### +# widget plugins +# (calendar, color, conditional, cutpaste, date, format, fortune, +# graphviz, haiku, img, linkmap, listdirectives, map, more, orphans, +# pagecount, pagestats, poll, polygen, postsparkline, progress, +# shortcut, sparkline, table, template, teximg, toc, toggle, version) +###################################################################### + +# calendar plugin +# base of the archives hierarchy +#archivebase: archives +# PageSpec of pages to include in the archives; used by ikiwiki-calendar command +#archive_pagespec: page(posts/*) and !*/Discussion + +# listdirectives plugin +# directory in srcdir that contains directive descriptions +#directive_description_dir: ikiwiki/directive + +# teximg plugin +# Should teximg use dvipng to render, or dvips and convert? +#teximg_dvipng: '' +# LaTeX prefix for teximg plugin +#teximg_prefix: | +# \documentclass{article} +# \usepackage[utf8]{inputenc} +# \usepackage{amsmath} +# \usepackage{amsfonts} +# \usepackage{amssymb} +# \pagestyle{empty} +# \begin{document} +# LaTeX postfix for teximg plugin +#teximg_postfix: '\end{document}' + +###################################################################### +# other plugins +# (aggregate, autoindex, brokenlinks, camelcase, ddate, embed, favicon, +# flattr, goodstuff, htmlbalance, ikiwikihosting, localstyle, +# missingsite, pagetemplate, parked, pingee, pinger, prettydate, +# recentchanges, recentchangesdiff, relativedate, rsync, sidebar, +# smiley, sortnaturally, tag, testpagespec, typography, underlay) +###################################################################### + +# aggregate plugin +# enable aggregation to internal pages? +#aggregateinternal: 1 +# allow aggregation to be triggered via the web? +#aggregate_webtrigger: 0 + +# camelcase plugin +# list of words to not turn into links +#camelcase_ignore: [] + +# flattr plugin +# userid or user name to use by default for Flattr buttons +#flattr_userid: joeyh + +# ikiwikihosting plugin +# list of urls that alias to the main url +#urlalias: [] +# openid of primary site owner +owner: http://joey.kitenet.net/ +# optional hostname of site this one was branched from +#parent: '' +# internal hostname of this site +hostname: git-annex.branchable.com +# site creation datestamp +created: 1287531313 +# how many days to retain logs +#log_period: 7 + +# parked plugin +# An optional message explaining why this site is parked. +#parked_message: '' + +# pinger plugin +# how many seconds to try pinging before timing out +#pinger_timeout: 15 + +# prettydate plugin +# format to use to display date +#prettydateformat: '%X, %B %o, %Y' + +# recentchanges plugin +# name of the recentchanges page +#recentchangespage: recentchanges +# number of changes to track +#recentchangesnum: 100 + +# rsync plugin +# command to run to sync updated pages +#rsync_command: rsync -qa --delete . user@host:/path/to/docroot/ + +# sidebar plugin +# show sidebar page on all pages? +#global_sidebars: 1 + +# tag plugin +# parent page tags are located under +#tagbase: tag +# autocreate new tag pages? +#tag_autocreate: 1 + +# typography plugin +# Text::Typography attributes value +#typographyattributes: 3 + +# underlay plugin +# extra underlay directories to add +#add_underlays: +# - /home/b-git-annex/wiki.underlay From 6f7be072535d3675ada287718bdd222bc9115a88 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 19 Oct 2010 23:35:31 +0000 Subject: [PATCH 002/114] commit of setup files --- ikiwiki.setup | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index e30a07ee7c..60d9edb50b 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -13,7 +13,7 @@ wikiname: git-annex adminemail: joey@kitenet.net # users who are wiki admins adminuser: - - http://none/ + - http://joey.kitenet.net/ # users who are banned from the wiki banned_users: [] # where the source of the wiki is located @@ -119,7 +119,7 @@ allow_symlinks_before_srcdir: 0 # Allow anyone to branch, check out, and copy this site? branchable: 1 # Display "Branchable" link on action bar? -#branchable_action: 1 +branchable_action: 1 # git plugin # git hook to generate @@ -137,9 +137,9 @@ historyurl: 'http://source.git-annex.branchable.com/?p=source.git;a=history;f=[[ # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted) diffurl: 'http://source.git-annex.branchable.com/?p=source.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]' # where to pull and push changes (set to empty string to disable) -#gitorigin_branch: origin +gitorigin_branch: origin # branch that the wiki is stored in -#gitmaster_branch: master +gitmaster_branch: master # htmlscrubber plugin # PageSpec specifying pages not to scrub @@ -155,7 +155,7 @@ atom: 1 # allow atom feeds to be used? #allowatom: 0 # urls to ping (using XML-RPC) on feed update -#pingurl: http://rpc.technorati.com/rpc/ping +pingurl: [] ###################################################################### # auth plugins @@ -211,9 +211,9 @@ openid_cgiurl: http://git-annex.branchable.com/ikiwiki.cgi # types of source files to syntax highlight tohighlight: .c .h .cpp .pl .py Makefile:make # location of highlight's filetypes.conf -#filetypes_conf: /etc/highlight/filetypes.conf +filetypes_conf: /etc/highlight/filetypes.conf # location of highlight's langDefs directory -#langdefdir: /usr/share/highlight/langDefs +langdefdir: /usr/share/highlight/langDefs # mdwn plugin # enable multimarkdown features? @@ -274,12 +274,13 @@ virus_checker: clamdscan - # repolist plugin # URIs of repositories containing the wiki's source -#repositories: -# - svn://svn.example.org/wiki/trunk +repositories: + - ssh://b-git-annex@git-annex.branchable.com/ + - git://git-annex.branchable.com/ # search plugin # path to the omega cgi program -#omega_cgi: /usr/lib/cgi-bin/omega/omega +omega_cgi: /usr/lib/cgi-bin/omega/omega # theme plugin # name of theme to enable @@ -321,7 +322,7 @@ websetup_show_unsafe: 0 # listdirectives plugin # directory in srcdir that contains directive descriptions -#directive_description_dir: ikiwiki/directive +directive_description_dir: ikiwiki/directive # teximg plugin # Should teximg use dvipng to render, or dvips and convert? @@ -389,9 +390,9 @@ created: 1287531313 # recentchanges plugin # name of the recentchanges page -#recentchangespage: recentchanges +recentchangespage: recentchanges # number of changes to track -#recentchangesnum: 100 +recentchangesnum: 100 # rsync plugin # command to run to sync updated pages From 7c204f7c27790318bc750d396d19608c7de27435 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 19 Oct 2010 23:36:23 +0000 Subject: [PATCH 003/114] commit of setup files --- .ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ssh/authorized_keys diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys new file mode 100644 index 0000000000..706dd50183 --- /dev/null +++ b/.ssh/authorized_keys @@ -0,0 +1 @@ +command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA37vjmeOfUQL9EO0JFOEIHfvE1xRx0vEMaxUNtxE85kyEIfgzN8uVJ66RPQwPI18EWM4ewJ00DM+WMuW9yCZQvdIhuYJvPWHWkX/4GcFTqPvYmzy5uTKT3GqpELv4FxbFM///2ewWRMsDoS0OOjnsTidUL/yzbfUD7n1oYsFEvakngwMRgM3g+WsMPXkk2K83cTSPWs7h8FMz6LnGQZndzEgW7ezOMyE0fZk3zAPu5ThIxc+/Tj6MoRO0aPoh6Ifzdx68EnU7yD0tyiBwv/vBUR16Q4vuAvDqqFL2nYJg5erLlSHyZ93yyrCZloJk8omRbMmBc+olVMc7vT9VMdj2Bw== From 1f24f788f8236a93979fb8272a73ebf7fef3f6bb Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 19 Oct 2010 19:39:23 -0400 Subject: [PATCH 004/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 60d9edb50b..4333cb5e1c 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -17,7 +17,7 @@ adminuser: # users who are banned from the wiki banned_users: [] # where the source of the wiki is located -srcdir: /home/b-git-annex/source +srcdir: /home/b-git-annex/source/doc # where to build the wiki destdir: /home/b-git-annex/public_html # base url to the wiki From baeec0497ed0f8582cbf02ef3353cce8ece421af Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 19 Oct 2010 23:40:32 +0000 Subject: [PATCH 005/114] commit of setup files --- ikiwiki.setup | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 4333cb5e1c..91d364c64b 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -54,6 +54,7 @@ add_plugins: - testpagespec - version - theme + - sidebar # plugins to disable disable_plugins: [] # additional directory to search for template files @@ -228,9 +229,9 @@ langdefdir: /usr/share/highlight/langDefs # - es|Español # - de|Deutsch # PageSpec controlling which pages are translatable -#po_translatable_pages: '* and !*/Discussion' +po_translatable_pages: '' # internal linking behavior (default/current/negotiated) -#po_link_to: current +po_link_to: default ###################################################################### # misc plugins @@ -239,9 +240,8 @@ langdefdir: /usr/share/highlight/langDefs ###################################################################### # web plugins -# (404, attachment, comments, editdiff, edittemplate, getsource, google, -# goto, mirrorlist, remove, rename, repolist, search, theme, websetup, -# wmd) +# (404, attachment, comments, editdiff, edittemplate, google, goto, +# mirrorlist, remove, rename, repolist, search, theme, websetup, wmd) ###################################################################### # attachment plugin @@ -252,21 +252,17 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -#comments_pagespec: blog/* and !*/Discussion +comments_pagespec: '' # PageSpec of pages where posting new comments is not allowed -#comments_closed_pagespec: blog/controversial or blog/flamewar +comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" -#comments_pagename: '' +comments_pagename: comment_ # Interpret directives in comments? #comments_allowdirectives: 0 # Allow anonymous commenters to set an author name? #comments_allowauthor: 0 # commit comments to the VCS -#comments_commit: 1 - -# getsource plugin -# Mime type for returned source. -#getsource_mimetype: text/plain; charset=utf-8 +comments_commit: 1 # mirrorlist plugin # list of mirrors @@ -350,7 +346,7 @@ directive_description_dir: ikiwiki/directive # aggregate plugin # enable aggregation to internal pages? -#aggregateinternal: 1 +aggregateinternal: 1 # allow aggregation to be triggered via the web? #aggregate_webtrigger: 0 @@ -386,7 +382,7 @@ created: 1287531313 # prettydate plugin # format to use to display date -#prettydateformat: '%X, %B %o, %Y' +prettydateformat: '%X, %B %o, %Y' # recentchanges plugin # name of the recentchanges page From 9e1332a1b2ffe754f2b756a69ea9f9fdf51bf1a5 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 21 Oct 2010 16:36:03 -0400 Subject: [PATCH 006/114] commit of setup files --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 91d364c64b..a9bb7d39c3 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -134,9 +134,9 @@ git_wrapper: /home/b-git-annex/source.git/hooks/post-update # unix users whose commits should be checked by the pre-receive hook #untrusted_committers: [] # gitweb url to show file history ([[file]] substituted) -historyurl: 'http://source.git-annex.branchable.com/?p=source.git;a=history;f=[[file]];hb=HEAD' +historyurl: 'http://source.git-annex.branchable.com/?p=source.git;a=history;f=doc/[[file]];hb=HEAD' # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted) -diffurl: 'http://source.git-annex.branchable.com/?p=source.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]' +diffurl: 'http://source.git-annex.branchable.com/?p=source.git;a=blobdiff;f=doc/[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]' # where to pull and push changes (set to empty string to disable) gitorigin_branch: origin # branch that the wiki is stored in From 192bcbfbe4318c8995d2652f138fb5dabdeb537c Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 14 Nov 2010 18:08:31 +0000 Subject: [PATCH 007/114] commit of setup files --- ikiwiki.setup | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index a9bb7d39c3..215c98faf5 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -55,6 +55,8 @@ add_plugins: - version - theme - sidebar + - blogspam + - comments # plugins to disable disable_plugins: [] # additional directory to search for template files @@ -170,7 +172,7 @@ pingurl: [] # blogspam plugin # PageSpec of pages to check for spam -#blogspam_pagespec: postcomment(*) +blogspam_pagespec: postcomment(*) # options to send to blogspam server #blogspam_options: 'blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10' # blogspam server XML-RPC url @@ -252,7 +254,7 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -comments_pagespec: '' +comments_pagespec: forum/* and !*/Discussion # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From 14cb55decf7cd5f71cc6658d2f3cab966b444fec Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 14 Nov 2010 18:11:09 +0000 Subject: [PATCH 008/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 215c98faf5..0b64fc4586 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -90,7 +90,7 @@ timeformat: '%c' # UTF-8 locale to use #locale: en_US.UTF-8 # put user pages below specified page -userdir: '' +userdir: users # how many backlinks to show before hiding excess (0 to show all) numbacklinks: 10 # attempt to hardlink source files? (optimisation for large files) From b1a2cf929db1d789f8972aa3255d724d6a790460 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 10 Jan 2011 14:16:04 -0400 Subject: [PATCH 009/114] commit of setup files --- ikiwiki.setup | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 0b64fc4586..856301dc02 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -414,3 +414,5 @@ recentchangesnum: 100 # extra underlay directories to add #add_underlays: # - /home/b-git-annex/wiki.underlay +ENV: + TMPDIR: /home/b-git-annex/tmp From 10b127449a99f974ecaf4e72608d74649b53fe30 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 27 Jan 2011 17:49:14 +0000 Subject: [PATCH 010/114] commit of setup files --- ikiwiki.setup | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 856301dc02..c95bf7932c 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -254,7 +254,7 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -comments_pagespec: forum/* and !*/Discussion +comments_pagespec: (forum/* or todo/* or bugs/*) and !*/Discussion # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" @@ -414,5 +414,3 @@ recentchangesnum: 100 # extra underlay directories to add #add_underlays: # - /home/b-git-annex/wiki.underlay -ENV: - TMPDIR: /home/b-git-annex/tmp From 7de2664270f6f6a068641194b42d1b176efe2c55 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 9 Mar 2011 18:41:28 +0000 Subject: [PATCH 011/114] commit of setup files --- ikiwiki.setup | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index c95bf7932c..6d5975af18 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -373,6 +373,8 @@ hostname: git-annex.branchable.com created: 1287531313 # how many days to retain logs #log_period: 7 +# disable IPv6? +ipv6_disabled: 1 # parked plugin # An optional message explaining why this site is parked. From 2b51a82ceffde9fe71c6362dd8baee092e0f1c08 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 9 Mar 2011 18:41:51 +0000 Subject: [PATCH 012/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 6d5975af18..d55b31b409 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -374,7 +374,7 @@ created: 1287531313 # how many days to retain logs #log_period: 7 # disable IPv6? -ipv6_disabled: 1 +ipv6_disabled: 0 # parked plugin # An optional message explaining why this site is parked. From 2e77bc8e42406e73c77750f5160920cdd4e56d06 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 15 Mar 2011 06:56:22 +0000 Subject: [PATCH 013/114] commit of setup files --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index d55b31b409..4929fbf7df 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -74,7 +74,7 @@ prefix_directives: 1 # use page/index.mdwn source files indexpages: 0 # enable Discussion pages? -discussion: 1 +discussion: 0 # name of Discussion pages discussionpage: Discussion # generate HTML5? (experimental) @@ -254,7 +254,7 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -comments_pagespec: (forum/* or todo/* or bugs/*) and !*/Discussion +comments_pagespec: '* and !*/Discussion and !ikiwiki/* and !index' # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From ee7a1014f1ab04a7ab82ce0f1fe2466cef91947e Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 15 Mar 2011 06:57:34 +0000 Subject: [PATCH 014/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 4929fbf7df..26086aefcf 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -254,7 +254,7 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -comments_pagespec: '* and !*/Discussion and !ikiwiki/* and !index' +comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From b39b8f60a50cdfd2182a12d7c107998a00b98078 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 15 Mar 2011 06:59:50 +0000 Subject: [PATCH 015/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 26086aefcf..b38c6c088e 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -254,7 +254,7 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index +comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From 1d3ae6b37c97e7984ba32a9c2245d6603683694b Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 15 Mar 2011 07:04:24 +0000 Subject: [PATCH 016/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index b38c6c088e..5ede136c61 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -254,7 +254,7 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news +comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news and !recentchanges # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From 3a6a03881e625050aa832c132ebd1f5d9ba6db33 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 16 Mar 2011 03:26:24 +0000 Subject: [PATCH 017/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 5ede136c61..4cfcdf5023 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -254,7 +254,7 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news and !recentchanges +comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news and !recentchanges and !comments # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From e4f0de725138554ada7090a3f519fa7ae2589c69 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 24 Mar 2011 17:59:47 +0000 Subject: [PATCH 018/114] commit of setup files --- ikiwiki.setup | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 4cfcdf5023..87e0c65aeb 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -103,6 +103,8 @@ hardlink: 1 libdir: /home/b-git-annex/.ikiwiki # environment variables ENV: {} +# time zone name +timezone: GMT # regexp of normally excluded files to include #include: '^\.htaccess$' # regexp of files that should be skipped @@ -343,7 +345,8 @@ directive_description_dir: ikiwiki/directive # flattr, goodstuff, htmlbalance, ikiwikihosting, localstyle, # missingsite, pagetemplate, parked, pingee, pinger, prettydate, # recentchanges, recentchangesdiff, relativedate, rsync, sidebar, -# smiley, sortnaturally, tag, testpagespec, typography, underlay) +# smiley, sortnaturally, tag, testpagespec, transient, typography, +# underlay) ###################################################################### # aggregate plugin @@ -351,6 +354,13 @@ directive_description_dir: ikiwiki/directive aggregateinternal: 1 # allow aggregation to be triggered via the web? #aggregate_webtrigger: 0 +# cookie control +cookiejar: + file: /home/b-git-annex/.ikiwiki/cookies + +# autoindex plugin +# commit autocreated index pages +autoindex_commit: 1 # camelcase plugin # list of words to not turn into links @@ -407,6 +417,8 @@ recentchangesnum: 100 #tagbase: tag # autocreate new tag pages? #tag_autocreate: 1 +# commit autocreated tag pages +tag_autocreate_commit: 1 # typography plugin # Text::Typography attributes value From 66fcf9e5cb7138f61e39eb932f7391ab9acd1dfb Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 28 Mar 2011 16:56:48 +0000 Subject: [PATCH 019/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 87e0c65aeb..7999e18cce 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -256,7 +256,7 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news and !recentchanges and !comments +comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news and !recentchanges and !comments and !walkthrough # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From 8f0598a7a645f924a68f95c1a8fd42da3d86fa21 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 31 Mar 2011 20:01:33 +0000 Subject: [PATCH 020/114] commit of setup files --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 7999e18cce..669d47fcba 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -57,6 +57,7 @@ add_plugins: - sidebar - blogspam - comments + - aggregate # plugins to disable disable_plugins: [] # additional directory to search for template files From 8aa8661cae67719ff50179d53309a3b4209e06ee Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 13 May 2011 23:12:51 +0000 Subject: [PATCH 021/114] commit of setup files --- ikiwiki.setup | 51 ++++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 669d47fcba..69dbffd71f 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -58,6 +58,7 @@ add_plugins: - blogspam - comments - aggregate + - gitpush # plugins to disable disable_plugins: [] # additional directory to search for template files @@ -117,8 +118,8 @@ allow_symlinks_before_srcdir: 0 ###################################################################### # core plugins -# (branchable, editpage, git, htmlscrubber, inline, link, meta, -# parentlinks) +# (branchable, editpage, git, gitpush, htmlscrubber, ikiwikihosting, +# inline, link, meta, parentlinks) ###################################################################### # branchable plugin @@ -147,10 +148,31 @@ gitorigin_branch: origin # branch that the wiki is stored in gitmaster_branch: master +# gitpush plugin +# git repository urls that changes are pushed to +git_push_to: + - git@github.com:joeyh/git-annex.git + # htmlscrubber plugin # PageSpec specifying pages not to scrub #htmlscrubber_skip: '!*/Discussion' +# ikiwikihosting plugin +# list of urls that alias to the main url +#urlalias: [] +# openid of primary site owner +owner: http://joey.kitenet.net/ +# optional hostname of site this one was branched from +#parent: '' +# internal hostname of this site +hostname: git-annex.branchable.com +# site creation datestamp +created: 1287531313 +# how many days to retain logs +#log_period: 7 +# disable IPv6? +ipv6_disabled: 0 + # inline plugin # enable rss feeds by default? rss: 1 @@ -343,11 +365,10 @@ directive_description_dir: ikiwiki/directive ###################################################################### # other plugins # (aggregate, autoindex, brokenlinks, camelcase, ddate, embed, favicon, -# flattr, goodstuff, htmlbalance, ikiwikihosting, localstyle, -# missingsite, pagetemplate, parked, pingee, pinger, prettydate, -# recentchanges, recentchangesdiff, relativedate, rsync, sidebar, -# smiley, sortnaturally, tag, testpagespec, transient, typography, -# underlay) +# flattr, goodstuff, htmlbalance, localstyle, missingsite, pagetemplate, +# parked, pingee, pinger, prettydate, recentchanges, recentchangesdiff, +# relativedate, rsync, sidebar, smiley, sortnaturally, tag, +# testpagespec, transient, typography, underlay) ###################################################################### # aggregate plugin @@ -371,22 +392,6 @@ autoindex_commit: 1 # userid or user name to use by default for Flattr buttons #flattr_userid: joeyh -# ikiwikihosting plugin -# list of urls that alias to the main url -#urlalias: [] -# openid of primary site owner -owner: http://joey.kitenet.net/ -# optional hostname of site this one was branched from -#parent: '' -# internal hostname of this site -hostname: git-annex.branchable.com -# site creation datestamp -created: 1287531313 -# how many days to retain logs -#log_period: 7 -# disable IPv6? -ipv6_disabled: 0 - # parked plugin # An optional message explaining why this site is parked. #parked_message: '' From 8623dee5dc31a9ea6caa9006eabb6584373ab684 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 15 May 2011 16:35:09 -0400 Subject: [PATCH 022/114] ikisite upgrade --- ikiwiki.setup | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 69dbffd71f..52344e0bff 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -25,9 +25,9 @@ url: http://git-annex.branchable.com # url to the ikiwiki.cgi cgiurl: http://git-annex.branchable.com/ikiwiki.cgi # filename of cgi wrapper to generate -cgi_wrapper: /home/b-git-annex/public_html/ikiwiki.cgi +cgi_wrapper: /var/www/b-git-annex/ikiwiki.cgi # mode for cgi_wrapper (can safely be made suid) -cgi_wrappermode: 06755 +cgi_wrappermode: 0755 # rcs backend to use rcs: git # plugins to add to the default configuration @@ -125,6 +125,8 @@ allow_symlinks_before_srcdir: 0 # branchable plugin # Allow anyone to branch, check out, and copy this site? branchable: 1 +# Allow anyone to git push verified changes to this site? +#anonpush: 0 # Display "Branchable" link on action bar? branchable_action: 1 @@ -138,7 +140,8 @@ git_wrapper: /home/b-git-annex/source.git/hooks/post-update # git pre-receive hook to generate #git_test_receive_wrapper: /git/wiki.git/hooks/pre-receive # unix users whose commits should be checked by the pre-receive hook -#untrusted_committers: [] +untrusted_committers: + - ikiwiki-anon # gitweb url to show file history ([[file]] substituted) historyurl: 'http://source.git-annex.branchable.com/?p=source.git;a=history;f=doc/[[file]];hb=HEAD' # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted) @@ -267,8 +270,9 @@ po_link_to: default ###################################################################### # web plugins -# (404, attachment, comments, editdiff, edittemplate, google, goto, -# mirrorlist, remove, rename, repolist, search, theme, websetup, wmd) +# (404, attachment, comments, editdiff, edittemplate, getsource, google, +# goto, mirrorlist, remove, rename, repolist, search, theme, websetup, +# wmd) ###################################################################### # attachment plugin @@ -291,6 +295,10 @@ comments_pagename: comment_ # commit comments to the VCS comments_commit: 1 +# getsource plugin +# Mime type for returned source. +#getsource_mimetype: text/plain; charset=utf-8 + # mirrorlist plugin # list of mirrors #mirrorlist: {} From 7b3a9e919860017dc7e3b7fba9f263eecffbf7e5 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 15 May 2011 20:58:39 +0000 Subject: [PATCH 023/114] commit of setup files --- ikiwiki.setup | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 52344e0bff..fb3e87ae38 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -126,7 +126,7 @@ allow_symlinks_before_srcdir: 0 # Allow anyone to branch, check out, and copy this site? branchable: 1 # Allow anyone to git push verified changes to this site? -#anonpush: 0 +anonpush: 1 # Display "Branchable" link on action bar? branchable_action: 1 @@ -270,9 +270,8 @@ po_link_to: default ###################################################################### # web plugins -# (404, attachment, comments, editdiff, edittemplate, getsource, google, -# goto, mirrorlist, remove, rename, repolist, search, theme, websetup, -# wmd) +# (404, attachment, comments, editdiff, edittemplate, google, goto, +# mirrorlist, remove, rename, repolist, search, theme, websetup, wmd) ###################################################################### # attachment plugin @@ -295,10 +294,6 @@ comments_pagename: comment_ # commit comments to the VCS comments_commit: 1 -# getsource plugin -# Mime type for returned source. -#getsource_mimetype: text/plain; charset=utf-8 - # mirrorlist plugin # list of mirrors #mirrorlist: {} From b949f1655843b8ec0c311fe1750b33afb06d10ce Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 19 May 2011 20:05:13 +0000 Subject: [PATCH 024/114] commit of setup files --- .ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index 706dd50183..c6a6c7e381 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -1 +1,2 @@ command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA37vjmeOfUQL9EO0JFOEIHfvE1xRx0vEMaxUNtxE85kyEIfgzN8uVJ66RPQwPI18EWM4ewJ00DM+WMuW9yCZQvdIhuYJvPWHWkX/4GcFTqPvYmzy5uTKT3GqpELv4FxbFM///2ewWRMsDoS0OOjnsTidUL/yzbfUD7n1oYsFEvakngwMRgM3g+WsMPXkk2K83cTSPWs7h8FMz6LnGQZndzEgW7ezOMyE0fZk3zAPu5ThIxc+/Tj6MoRO0aPoh6Ifzdx68EnU7yD0tyiBwv/vBUR16Q4vuAvDqqFL2nYJg5erLlSHyZ93yyrCZloJk8omRbMmBc+olVMc7vT9VMdj2Bw== +command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHSsklzM1JeY8umxE/t9GJnMDTd6Jy7sFbASeSWw6BTSi+X1Qdm9VRmjTsdv26RIGzBOQdAybqO3BQj1cEZ51UJ/kTSXRzy92SUj7WuEdJu9ckOSs0sLld94b4dFLbG3bmSKBx4svUrGNJwedOOhRxXdV0rryOduy7HZVEq63q/aEquEgwfPo9bAOEhtdzVoLZco7eMSZFizLYQAPfmr9mJ3nhAcYZScPDWlLu37tqPxm9N4ZJ7syb13uSj2PcBxrDk1NXaPawg2itF1l61x1jDTLPrpQK0U24O1RI22XwQuE7P0qw63cPEuv4X9zscNgAPmtrGO3VstzovhmFxNrQ== From 2265f396cc09b9984edf44c1ae9b5e8f8bf81abb Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 19 May 2011 20:05:53 +0000 Subject: [PATCH 025/114] commit of setup files --- .ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index c6a6c7e381..9d2cd4197e 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -1,2 +1,3 @@ command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA37vjmeOfUQL9EO0JFOEIHfvE1xRx0vEMaxUNtxE85kyEIfgzN8uVJ66RPQwPI18EWM4ewJ00DM+WMuW9yCZQvdIhuYJvPWHWkX/4GcFTqPvYmzy5uTKT3GqpELv4FxbFM///2ewWRMsDoS0OOjnsTidUL/yzbfUD7n1oYsFEvakngwMRgM3g+WsMPXkk2K83cTSPWs7h8FMz6LnGQZndzEgW7ezOMyE0fZk3zAPu5ThIxc+/Tj6MoRO0aPoh6Ifzdx68EnU7yD0tyiBwv/vBUR16Q4vuAvDqqFL2nYJg5erLlSHyZ93yyrCZloJk8omRbMmBc+olVMc7vT9VMdj2Bw== +command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArWtxJCzXFdGwpBOzW4vOjXOGySEVuLWlyF9qTXVPw0yoLP8H4XokgAwzdHd6/qb2kNgL8/igy1eFy7aDrXABbPzD6449lNzIYeI6bV5+jMG+pmcCGIzDasFAx9iF0cKM7+7gxlmQZZ/QvW5nc6UhbmtTThvp2TS/4qhiAXecJRsPgnMjEOayy2FVLtmB5vymtH5BrjPZxWwPDGdACqS0uh4ydvVgIt4aoeQog3cjPPg6mZ7xvDLa3mmv8MTWvsPvl3qaAICsMnWLW49PkmZx9259v3XTD2ZSathC9rqCmzWeknutbnTCLBdA4dJI54dxvQw+faNl1qJIyO1ZDJmjAQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHSsklzM1JeY8umxE/t9GJnMDTd6Jy7sFbASeSWw6BTSi+X1Qdm9VRmjTsdv26RIGzBOQdAybqO3BQj1cEZ51UJ/kTSXRzy92SUj7WuEdJu9ckOSs0sLld94b4dFLbG3bmSKBx4svUrGNJwedOOhRxXdV0rryOduy7HZVEq63q/aEquEgwfPo9bAOEhtdzVoLZco7eMSZFizLYQAPfmr9mJ3nhAcYZScPDWlLu37tqPxm9N4ZJ7syb13uSj2PcBxrDk1NXaPawg2itF1l61x1jDTLPrpQK0U24O1RI22XwQuE7P0qw63cPEuv4X9zscNgAPmtrGO3VstzovhmFxNrQ== From b36d8a6264bcf02c87bd70acf507e9cfa696209c Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 19 May 2011 20:08:07 +0000 Subject: [PATCH 026/114] commit of setup files --- ikiwiki.setup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index fb3e87ae38..4207b24be0 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -138,7 +138,7 @@ git_wrapper: /home/b-git-annex/source.git/hooks/post-update # mode for git_wrapper (can safely be made suid) #git_wrappermode: 06755 # git pre-receive hook to generate -#git_test_receive_wrapper: /git/wiki.git/hooks/pre-receive +git_test_receive_wrapper: /home/b-git-annex/source.git/hooks/pre-receive # unix users whose commits should be checked by the pre-receive hook untrusted_committers: - ikiwiki-anon @@ -155,6 +155,7 @@ gitmaster_branch: master # git repository urls that changes are pushed to git_push_to: - git@github.com:joeyh/git-annex.git + - joey@git.kitenet.net:/srv/git/git-annex # htmlscrubber plugin # PageSpec specifying pages not to scrub From f845fcc034f24851e8d1a2951b09ba841bf69308 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 28 May 2011 16:24:53 +0000 Subject: [PATCH 027/114] commit of setup files --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 4207b24be0..7584555d3b 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -159,7 +159,7 @@ git_push_to: # htmlscrubber plugin # PageSpec specifying pages not to scrub -#htmlscrubber_skip: '!*/Discussion' +htmlscrubber_skip: tarball # ikiwikihosting plugin # list of urls that alias to the main url @@ -215,7 +215,7 @@ blogspam_pagespec: postcomment(*) # lockedit plugin # PageSpec controlling which pages are locked -#locked_pages: '!*/Discussion' +locked_pages: tarball # moderatedcomments plugin # PageSpec matching users or comment locations to moderate From 4936d05c81d8bfb5af2896ea9fbbff9d22842c10 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 3 Jul 2011 19:16:20 +0000 Subject: [PATCH 028/114] commit of setup files --- ikiwiki.setup | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 7584555d3b..e10c39b309 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -79,7 +79,7 @@ indexpages: 0 discussion: 0 # name of Discussion pages discussionpage: Discussion -# generate HTML5? (experimental) +# generate HTML5? html5: 0 # only send cookies over SSL connections? sslcookie: 0 @@ -271,8 +271,9 @@ po_link_to: default ###################################################################### # web plugins -# (404, attachment, comments, editdiff, edittemplate, google, goto, -# mirrorlist, remove, rename, repolist, search, theme, websetup, wmd) +# (404, attachment, comments, editdiff, edittemplate, getsource, google, +# goto, mirrorlist, remove, rename, repolist, search, theme, userlist, +# websetup, wmd) ###################################################################### # attachment plugin @@ -295,6 +296,10 @@ comments_pagename: comment_ # commit comments to the VCS comments_commit: 1 +# getsource plugin +# Mime type for returned source. +#getsource_mimetype: text/plain; charset=utf-8 + # mirrorlist plugin # list of mirrors #mirrorlist: {} @@ -330,15 +335,17 @@ websetup_unsafe: - prefix_directives - indexpages - repositories + - sslcookie # show unsafe settings, read-only, in web interface? websetup_show_unsafe: 0 ###################################################################### # widget plugins # (calendar, color, conditional, cutpaste, date, format, fortune, -# graphviz, haiku, img, linkmap, listdirectives, map, more, orphans, -# pagecount, pagestats, poll, polygen, postsparkline, progress, -# shortcut, sparkline, table, template, teximg, toc, toggle, version) +# graphviz, haiku, headinganchors, img, linkmap, listdirectives, map, +# more, orphans, pagecount, pagestats, poll, polygen, postsparkline, +# progress, shortcut, sparkline, table, template, teximg, toc, toggle, +# version) ###################################################################### # calendar plugin From ddf74e5fa3d2244c947fbdc88680d2b9b8e8bc23 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Feb 2012 17:21:28 -0400 Subject: [PATCH 029/114] enable template plugin --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index e10c39b309..064a0f6ce3 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -59,6 +59,7 @@ add_plugins: - comments - aggregate - gitpush + - template # plugins to disable disable_plugins: [] # additional directory to search for template files From 0791b1bfb938b1019c156ea2d71d22c7f304911c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Apr 2012 12:33:08 -0400 Subject: [PATCH 030/114] enable the notifyemail plugin --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 064a0f6ce3..229af010af 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -60,6 +60,7 @@ add_plugins: - aggregate - gitpush - template + - notifyemail # plugins to disable disable_plugins: [] # additional directory to search for template files From 0f8d2f54fac82f0b28faadde41ffbf56c1d1e095 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Apr 2012 15:20:52 -0400 Subject: [PATCH 031/114] set up a page so I can embed some into it --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 229af010af..1fb07e7796 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -161,7 +161,7 @@ git_push_to: # htmlscrubber plugin # PageSpec specifying pages not to scrub -htmlscrubber_skip: tarball +htmlscrubber_skip: forum/tell_us_how_you__39__re_using_git-annex # ikiwikihosting plugin # list of urls that alias to the main url @@ -217,7 +217,7 @@ blogspam_pagespec: postcomment(*) # lockedit plugin # PageSpec controlling which pages are locked -locked_pages: tarball +locked_pages: forum/tell_us_how_you__39__re_using_git-annex # moderatedcomments plugin # PageSpec matching users or comment locations to moderate From 0345d23886899ff9f4dc6971cc839aa820ee62ff Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Apr 2012 15:35:46 -0400 Subject: [PATCH 032/114] renamed page --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 1fb07e7796..65f9a63826 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -161,7 +161,7 @@ git_push_to: # htmlscrubber plugin # PageSpec specifying pages not to scrub -htmlscrubber_skip: forum/tell_us_how_you__39__re_using_git-annex +htmlscrubber_skip: testimonials # ikiwikihosting plugin # list of urls that alias to the main url @@ -217,7 +217,7 @@ blogspam_pagespec: postcomment(*) # lockedit plugin # PageSpec controlling which pages are locked -locked_pages: forum/tell_us_how_you__39__re_using_git-annex +locked_pages: testimonials # moderatedcomments plugin # PageSpec matching users or comment locations to moderate From 756268104d296e98688fe52354860bc0b44d0591 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 May 2012 11:32:51 -0400 Subject: [PATCH 033/114] add my joeyh.name url as an admin --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 65f9a63826..5a29eb8be8 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -14,6 +14,7 @@ adminemail: joey@kitenet.net # users who are wiki admins adminuser: - http://joey.kitenet.net/ + - http://joeyh.name/ # users who are banned from the wiki banned_users: [] # where the source of the wiki is located From 4d45673b958fd38ef2dff921be533d59cfe8a96d Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 27 May 2012 00:19:12 +0000 Subject: [PATCH 034/114] commit of setup files --- ikiwiki.setup | 226 +++++++++++++++++++++++++++----------------------- 1 file changed, 123 insertions(+), 103 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 5a29eb8be8..bb7094ee8a 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -13,8 +13,8 @@ wikiname: git-annex adminemail: joey@kitenet.net # users who are wiki admins adminuser: - - http://joey.kitenet.net/ - - http://joeyh.name/ +- http://joey.kitenet.net/ +- http://joeyh.name/ # users who are banned from the wiki banned_users: [] # where the source of the wiki is located @@ -28,40 +28,41 @@ cgiurl: http://git-annex.branchable.com/ikiwiki.cgi # filename of cgi wrapper to generate cgi_wrapper: /var/www/b-git-annex/ikiwiki.cgi # mode for cgi_wrapper (can safely be made suid) -cgi_wrappermode: 0755 +cgi_wrappermode: '0755' # rcs backend to use rcs: git # plugins to add to the default configuration add_plugins: - - goodstuff - - websetup - - 404 - - ikiwikihosting - - branchable - - recentchangesdiff - - attachment - - remove - - rename - - edittemplate - - favicon - - format - - fortune - - highlight - - listdirectives - - poll - - progress - - relativedate - - search - - testpagespec - - version - - theme - - sidebar - - blogspam - - comments - - aggregate - - gitpush - - template - - notifyemail +- goodstuff +- websetup +- '404' +- ikiwikihosting +- branchable +- recentchangesdiff +- attachment +- remove +- rename +- edittemplate +- favicon +- format +- fortune +- highlight +- listdirectives +- poll +- progress +- relativedate +- search +- testpagespec +- version +- theme +- sidebar +- blogspam +- comments +- aggregate +- gitpush +- template +- notifyemail +- trail # plugins to disable disable_plugins: [] # additional directory to search for template files @@ -71,21 +72,21 @@ underlaydir: /usr/share/ikiwiki/basewiki # display verbose messages? #verbose: 1 # log to syslog? -syslog: 1 +syslog: '1' # create output files named page/index.html? -usedirs: 1 +usedirs: '1' # use '!'-prefixed preprocessor directives? -prefix_directives: 1 +prefix_directives: '1' # use page/index.mdwn source files -indexpages: 0 +indexpages: '0' # enable Discussion pages? -discussion: 0 +discussion: '0' # name of Discussion pages discussionpage: Discussion # generate HTML5? -html5: 0 +html5: '0' # only send cookies over SSL connections? -sslcookie: 0 +sslcookie: '0' # extension to use for new pages default_pageext: mdwn # extension to use for html files @@ -97,11 +98,11 @@ timeformat: '%c' # put user pages below specified page userdir: users # how many backlinks to show before hiding excess (0 to show all) -numbacklinks: 10 +numbacklinks: '10' # attempt to hardlink source files? (optimisation for large files) -hardlink: 1 -# force ikiwiki to use a particular umask -#umask: 022 +hardlink: '1' +# force ikiwiki to use a particular umask (keywords public, group or private, or a number) +#umask: public # group for wrappers to run in #wrappergroup: ikiwiki # extra library and plugin directory @@ -111,13 +112,13 @@ ENV: {} # time zone name timezone: GMT # regexp of normally excluded files to include -#include: '^\.htaccess$' +#include: ^\.htaccess$ # regexp of files that should be skipped -#exclude: '^(*\.private|Makefile)$' +#exclude: ^(*\.private|Makefile)$ # specifies the characters that are allowed in source filenames -wiki_file_chars: '-[:alnum:]+/.:_' +wiki_file_chars: -[:alnum:]+/.:_ # allow symlinks in the path leading to the srcdir (potentially insecure) -allow_symlinks_before_srcdir: 0 +allow_symlinks_before_srcdir: '0' ###################################################################### # core plugins @@ -127,11 +128,11 @@ allow_symlinks_before_srcdir: 0 # branchable plugin # Allow anyone to branch, check out, and copy this site? -branchable: 1 +branchable: '1' # Allow anyone to git push verified changes to this site? -anonpush: 1 +anonpush: '1' # Display "Branchable" link on action bar? -branchable_action: 1 +branchable_action: '1' # git plugin # git hook to generate @@ -139,16 +140,16 @@ git_wrapper: /home/b-git-annex/source.git/hooks/post-update # shell command for git_wrapper to run, in the background #git_wrapper_background_command: git push github # mode for git_wrapper (can safely be made suid) -#git_wrappermode: 06755 +#git_wrappermode: '06755' # git pre-receive hook to generate git_test_receive_wrapper: /home/b-git-annex/source.git/hooks/pre-receive # unix users whose commits should be checked by the pre-receive hook untrusted_committers: - - ikiwiki-anon +- ikiwiki-anon # gitweb url to show file history ([[file]] substituted) -historyurl: 'http://source.git-annex.branchable.com/?p=source.git;a=history;f=doc/[[file]];hb=HEAD' +historyurl: http://source.git-annex.branchable.com/?p=source.git;a=history;f=doc/[[file]];hb=HEAD # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted) -diffurl: 'http://source.git-annex.branchable.com/?p=source.git;a=blobdiff;f=doc/[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]' +diffurl: http://source.git-annex.branchable.com/?p=source.git;a=blobdiff;f=doc/[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]] # where to pull and push changes (set to empty string to disable) gitorigin_branch: origin # branch that the wiki is stored in @@ -157,8 +158,8 @@ gitmaster_branch: master # gitpush plugin # git repository urls that changes are pushed to git_push_to: - - git@github.com:joeyh/git-annex.git - - joey@git.kitenet.net:/srv/git/git-annex +- git@github.com:joeyh/git-annex.git +- joey@git.kitenet.net:/srv/git/git-annex # htmlscrubber plugin # PageSpec specifying pages not to scrub @@ -174,17 +175,17 @@ owner: http://joey.kitenet.net/ # internal hostname of this site hostname: git-annex.branchable.com # site creation datestamp -created: 1287531313 +created: '1287531313' # how many days to retain logs #log_period: 7 # disable IPv6? -ipv6_disabled: 0 +ipv6_disabled: '0' # inline plugin # enable rss feeds by default? -rss: 1 +rss: '1' # enable atom feeds by default? -atom: 1 +atom: '1' # allow rss feeds to be used? #allowrss: 0 # allow atom feeds to be used? @@ -206,7 +207,7 @@ pingurl: [] # PageSpec of pages to check for spam blogspam_pagespec: postcomment(*) # options to send to blogspam server -#blogspam_options: 'blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10' +#blogspam_options: blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10 # blogspam server XML-RPC url #blogspam_server: '' @@ -253,29 +254,43 @@ langdefdir: /usr/share/highlight/langDefs # mdwn plugin # enable multimarkdown features? #multimarkdown: 0 +# disable use of markdown discount? +#nodiscount: 0 # po plugin # master language (non-PO files) #po_master_language: en|English # slave languages (translated via PO files) format: ll|Langname #po_slave_languages: -# - fr|Français -# - es|Español -# - de|Deutsch +#- fr|Français +#- es|Español +#- de|Deutsch # PageSpec controlling which pages are translatable po_translatable_pages: '' # internal linking behavior (default/current/negotiated) po_link_to: default ###################################################################### -# misc plugins -# (filecheck) +# special-purpose plugins +# (osm) ###################################################################### +# osm plugin +# the default zoom when you click on the map link +#osm_default_zoom: '15' +# the icon shown on links and on the main map +#osm_default_icon: ikiwiki/images/osm.png +# the alt tag of links, defaults to empty +#osm_alt: '' +# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated) +#osm_format: KML +# the icon attached to a tag, displayed on the map for tagged pages +#osm_tag_default_icon: icon.png + ###################################################################### # web plugins -# (404, attachment, comments, editdiff, edittemplate, getsource, google, -# goto, mirrorlist, remove, rename, repolist, search, theme, userlist, +# (404, attachment, comments, editdiff, edittemplate, google, goto, +# mirrorlist, remove, rename, repolist, search, theme, userlist, # websetup, wmd) ###################################################################### @@ -287,7 +302,8 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed -comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news and !recentchanges and !comments and !walkthrough +comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum + and !bugs and !todo and !news and !recentchanges and !comments and !walkthrough # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" @@ -297,11 +313,7 @@ comments_pagename: comment_ # Allow anonymous commenters to set an author name? #comments_allowauthor: 0 # commit comments to the VCS -comments_commit: 1 - -# getsource plugin -# Mime type for returned source. -#getsource_mimetype: text/plain; charset=utf-8 +comments_commit: '1' # mirrorlist plugin # list of mirrors @@ -310,8 +322,8 @@ comments_commit: 1 # repolist plugin # URIs of repositories containing the wiki's source repositories: - - ssh://b-git-annex@git-annex.branchable.com/ - - git://git-annex.branchable.com/ +- ssh://b-git-annex@git-annex.branchable.com/ +- git://git-annex.branchable.com/ # search plugin # path to the omega cgi program @@ -324,23 +336,23 @@ omega_cgi: /usr/lib/cgi-bin/omega/omega # websetup plugin # list of plugins that cannot be enabled/disabled via the web interface websetup_force_plugins: - - httpauth - - openid - - mdwn - - wmd +- httpauth +- openid +- mdwn +- wmd # list of additional setup field keys to treat as unsafe websetup_unsafe: - - url - - cgiurl - - verbose - - syslog - - usedirs - - prefix_directives - - indexpages - - repositories - - sslcookie +- url +- cgiurl +- verbose +- syslog +- usedirs +- prefix_directives +- indexpages +- repositories +- sslcookie # show unsafe settings, read-only, in web interface? -websetup_show_unsafe: 0 +websetup_show_unsafe: '0' ###################################################################### # widget plugins @@ -365,29 +377,37 @@ directive_description_dir: ikiwiki/directive # Should teximg use dvipng to render, or dvips and convert? #teximg_dvipng: '' # LaTeX prefix for teximg plugin -#teximg_prefix: | -# \documentclass{article} +#teximg_prefix: '\documentclass{article} +# # \usepackage[utf8]{inputenc} +# # \usepackage{amsmath} +# # \usepackage{amsfonts} +# # \usepackage{amssymb} +# # \pagestyle{empty} +# # \begin{document} +# +#' # LaTeX postfix for teximg plugin -#teximg_postfix: '\end{document}' +#teximg_postfix: \end{document} ###################################################################### # other plugins # (aggregate, autoindex, brokenlinks, camelcase, ddate, embed, favicon, -# flattr, goodstuff, htmlbalance, localstyle, missingsite, pagetemplate, -# parked, pingee, pinger, prettydate, recentchanges, recentchangesdiff, -# relativedate, rsync, sidebar, smiley, sortnaturally, tag, -# testpagespec, transient, typography, underlay) +# filecheck, flattr, goodstuff, htmlbalance, localstyle, missingsite, +# notifyemail, pagetemplate, parked, pingee, pinger, prettydate, +# recentchanges, recentchangesdiff, relativedate, rsync, sidebar, +# smiley, sortnaturally, tag, testpagespec, trail, transient, +# typography, underlay) ###################################################################### # aggregate plugin # enable aggregation to internal pages? -aggregateinternal: 1 +aggregateinternal: '1' # allow aggregation to be triggered via the web? #aggregate_webtrigger: 0 # cookie control @@ -396,7 +416,7 @@ cookiejar: # autoindex plugin # commit autocreated index pages -autoindex_commit: 1 +autoindex_commit: '1' # camelcase plugin # list of words to not turn into links @@ -422,7 +442,7 @@ prettydateformat: '%X, %B %o, %Y' # name of the recentchanges page recentchangespage: recentchanges # number of changes to track -recentchangesnum: 100 +recentchangesnum: '100' # rsync plugin # command to run to sync updated pages @@ -438,13 +458,13 @@ recentchangesnum: 100 # autocreate new tag pages? #tag_autocreate: 1 # commit autocreated tag pages -tag_autocreate_commit: 1 +tag_autocreate_commit: '1' # typography plugin # Text::Typography attributes value -#typographyattributes: 3 +#typographyattributes: '3' # underlay plugin # extra underlay directories to add #add_underlays: -# - /home/b-git-annex/wiki.underlay +#- /home/b-git-annex/wiki.underlay From 611698dfdaccb6bbbcfceebdcdb22612068cb568 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 4 Jun 2012 20:19:28 +0000 Subject: [PATCH 035/114] commit of setup files --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index bb7094ee8a..3ece9fff82 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -304,6 +304,7 @@ virus_checker: clamdscan - # PageSpec of pages where comments are allowed comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news and !recentchanges and !comments and !walkthrough + and !design/assistant/blog # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From a701e10db1c1689e9c49ccb96eec10bf8851aba9 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 13 Jul 2012 18:06:28 +0000 Subject: [PATCH 036/114] commit of setup files --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 3ece9fff82..f2ddd515f2 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -51,7 +51,6 @@ add_plugins: - poll - progress - relativedate -- search - testpagespec - version - theme @@ -64,7 +63,8 @@ add_plugins: - notifyemail - trail # plugins to disable -disable_plugins: [] +disable_plugins: +- search # additional directory to search for template files templatedir: /usr/share/ikiwiki/templates # base wiki source location From 5b65439322dcad7ce6642b1dac712007198b670a Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 16 Jul 2012 19:22:39 +0000 Subject: [PATCH 037/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index f2ddd515f2..dc103454d8 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -62,9 +62,9 @@ add_plugins: - template - notifyemail - trail +- search # plugins to disable disable_plugins: -- search # additional directory to search for template files templatedir: /usr/share/ikiwiki/templates # base wiki source location From f1008e78ecb55888bd66055b8655c92a31a91a54 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 18 Jul 2012 20:22:38 +0000 Subject: [PATCH 038/114] commit of setup files --- ikiwiki.setup | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index dc103454d8..ad641dc418 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -63,8 +63,7 @@ add_plugins: - notifyemail - trail - search -# plugins to disable -disable_plugins: +disable_plugins: [] # additional directory to search for template files templatedir: /usr/share/ikiwiki/templates # base wiki source location From 9eed9869adb3db46b053739fd55027dd6290b991 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 26 Jul 2012 17:29:35 +0000 Subject: [PATCH 039/114] commit of setup files --- ikiwiki.setup | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index ad641dc418..a3b86ffc0b 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -55,7 +55,6 @@ add_plugins: - version - theme - sidebar -- blogspam - comments - aggregate - gitpush @@ -63,7 +62,9 @@ add_plugins: - notifyemail - trail - search -disable_plugins: [] +# plugins to disable +disable_plugins: +- blogspam # additional directory to search for template files templatedir: /usr/share/ikiwiki/templates # base wiki source location From c8aca38118c92a69886ebb7ba247bd7338ad50c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Aug 2012 16:23:54 -0400 Subject: [PATCH 040/114] enable shortcut --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index a3b86ffc0b..84dae13a74 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -62,6 +62,7 @@ add_plugins: - notifyemail - trail - search +- shortcut # plugins to disable disable_plugins: - blogspam From 67c8b0c4b20724b5f1749ce6429648bec6203997 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 14 Dec 2012 18:49:20 +0000 Subject: [PATCH 041/114] commit of setup files --- ikiwiki.setup | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 84dae13a74..44b51abef3 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -29,6 +29,10 @@ cgiurl: http://git-annex.branchable.com/ikiwiki.cgi cgi_wrapper: /var/www/b-git-annex/ikiwiki.cgi # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode: '0755' +# number of seconds to delay CGI requests when overloaded +cgi_overload_delay: '' +# message to display when overloaded (may contain html) +cgi_overload_message: '' # rcs backend to use rcs: git # plugins to add to the default configuration @@ -63,6 +67,7 @@ add_plugins: - trail - search - shortcut +- calendar # plugins to disable disable_plugins: - blogspam @@ -287,6 +292,13 @@ po_link_to: default #osm_format: KML # the icon attached to a tag, displayed on the map for tagged pages #osm_tag_default_icon: icon.png +# Url for the OpenLayers.js file +#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js +# Layers to use in the map. Can be either the 'OSM' string or a type option for Google maps (GoogleNormal, GoogleSatellite, GoogleHybrid or GooglePhysical). It can also be an arbitrary URL in a syntax acceptable for OpenLayers.Layer.OSM.url parameter. +#osm_layers: +# OSM: GoogleSatellite +# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key +#osm_google_apikey: '' ###################################################################### # web plugins @@ -320,6 +332,8 @@ comments_commit: '1' # mirrorlist plugin # list of mirrors #mirrorlist: {} +# generate links that point to the mirrors' ikiwiki CGI +#mirrorlist_use_cgi: 1 # repolist plugin # URIs of repositories containing the wiki's source @@ -367,9 +381,9 @@ websetup_show_unsafe: '0' # calendar plugin # base of the archives hierarchy -#archivebase: archives +archivebase: design/assistant/blog/archives # PageSpec of pages to include in the archives; used by ikiwiki-calendar command -#archive_pagespec: page(posts/*) and !*/Discussion +archive_pagespec: page(design/assistant/blog/*) # listdirectives plugin # directory in srcdir that contains directive descriptions From 69ea80dc7c25bae017eb29147e06f57a5a99399e Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 16 Dec 2012 19:17:14 +0000 Subject: [PATCH 042/114] commit of setup files --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 44b51abef3..bc42bb821a 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -381,9 +381,9 @@ websetup_show_unsafe: '0' # calendar plugin # base of the archives hierarchy -archivebase: design/assistant/blog/archives +archivebase: '' # PageSpec of pages to include in the archives; used by ikiwiki-calendar command -archive_pagespec: page(design/assistant/blog/*) +archive_pagespec: '' # listdirectives plugin # directory in srcdir that contains directive descriptions From fe26fe61f4324b3f8d04db08085626703edc8cdf Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 1 Mar 2013 17:04:28 +0000 Subject: [PATCH 043/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index bc42bb821a..77686330e0 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -251,7 +251,7 @@ openid_cgiurl: http://git-annex.branchable.com/ikiwiki.cgi # highlight plugin # types of source files to syntax highlight -tohighlight: .c .h .cpp .pl .py Makefile:make +tohighlight: '' # location of highlight's filetypes.conf filetypes_conf: /etc/highlight/filetypes.conf # location of highlight's langDefs directory From 8ab4737719087611e1cfdb77fc953a35681e93d0 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 1 Mar 2013 17:49:52 +0000 Subject: [PATCH 044/114] commit of setup files --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 77686330e0..925a0d3ee3 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -68,6 +68,7 @@ add_plugins: - search - shortcut - calendar +- txt # plugins to disable disable_plugins: - blogspam From 1b4c448eebaf54c2a173266561c5292130db3982 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Mar 2013 18:00:12 -0400 Subject: [PATCH 045/114] switch to actiontabs theme --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 925a0d3ee3..c3c45cd8a5 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -348,7 +348,7 @@ omega_cgi: /usr/lib/cgi-bin/omega/omega # theme plugin # name of theme to enable -#theme: actiontabs +theme: actiontabs # websetup plugin # list of plugins that cannot be enabled/disabled via the web interface From 8c98f8f3c74c51ad59d011c6e7f1f58e7689b930 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Mar 2013 18:04:50 -0400 Subject: [PATCH 046/114] let's try global sidebar and see if it sucks --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index c3c45cd8a5..ac173b0169 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -467,7 +467,7 @@ recentchangesnum: '100' # sidebar plugin # show sidebar page on all pages? -#global_sidebars: 1 +global_sidebars: 1 # tag plugin # parent page tags are located under From a28a08d98da8ed40e9d211d8b723bc020c4dfd4b Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 13 Apr 2013 23:10:25 +0000 Subject: [PATCH 047/114] commit of setup files --- .ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index 9d2cd4197e..79209207da 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -1,3 +1,4 @@ command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA37vjmeOfUQL9EO0JFOEIHfvE1xRx0vEMaxUNtxE85kyEIfgzN8uVJ66RPQwPI18EWM4ewJ00DM+WMuW9yCZQvdIhuYJvPWHWkX/4GcFTqPvYmzy5uTKT3GqpELv4FxbFM///2ewWRMsDoS0OOjnsTidUL/yzbfUD7n1oYsFEvakngwMRgM3g+WsMPXkk2K83cTSPWs7h8FMz6LnGQZndzEgW7ezOMyE0fZk3zAPu5ThIxc+/Tj6MoRO0aPoh6Ifzdx68EnU7yD0tyiBwv/vBUR16Q4vuAvDqqFL2nYJg5erLlSHyZ93yyrCZloJk8omRbMmBc+olVMc7vT9VMdj2Bw== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArWtxJCzXFdGwpBOzW4vOjXOGySEVuLWlyF9qTXVPw0yoLP8H4XokgAwzdHd6/qb2kNgL8/igy1eFy7aDrXABbPzD6449lNzIYeI6bV5+jMG+pmcCGIzDasFAx9iF0cKM7+7gxlmQZZ/QvW5nc6UhbmtTThvp2TS/4qhiAXecJRsPgnMjEOayy2FVLtmB5vymtH5BrjPZxWwPDGdACqS0uh4ydvVgIt4aoeQog3cjPPg6mZ7xvDLa3mmv8MTWvsPvl3qaAICsMnWLW49PkmZx9259v3XTD2ZSathC9rqCmzWeknutbnTCLBdA4dJI54dxvQw+faNl1qJIyO1ZDJmjAQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHSsklzM1JeY8umxE/t9GJnMDTd6Jy7sFbASeSWw6BTSi+X1Qdm9VRmjTsdv26RIGzBOQdAybqO3BQj1cEZ51UJ/kTSXRzy92SUj7WuEdJu9ckOSs0sLld94b4dFLbG3bmSKBx4svUrGNJwedOOhRxXdV0rryOduy7HZVEq63q/aEquEgwfPo9bAOEhtdzVoLZco7eMSZFizLYQAPfmr9mJ3nhAcYZScPDWlLu37tqPxm9N4ZJ7syb13uSj2PcBxrDk1NXaPawg2itF1l61x1jDTLPrpQK0U24O1RI22XwQuE7P0qw63cPEuv4X9zscNgAPmtrGO3VstzovhmFxNrQ== +command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@gnu From cf0154732692febdedbf988f6807b093b39599c4 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 24 Apr 2013 00:05:09 +0000 Subject: [PATCH 048/114] commit of setup files --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index ac173b0169..88766d82df 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -324,7 +324,7 @@ comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" comments_pagename: comment_ # Interpret directives in comments? -#comments_allowdirectives: 0 +comments_allowdirectives: '1' # Allow anonymous commenters to set an author name? #comments_allowauthor: 0 # commit comments to the VCS @@ -467,7 +467,7 @@ recentchangesnum: '100' # sidebar plugin # show sidebar page on all pages? -global_sidebars: 1 +global_sidebars: '1' # tag plugin # parent page tags are located under From df198494237b095fd2166ca44e07a112a999e5a2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Sep 2013 23:09:46 -0400 Subject: [PATCH 049/114] setup builds page --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 88766d82df..687341c106 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -170,7 +170,7 @@ git_push_to: # htmlscrubber plugin # PageSpec specifying pages not to scrub -htmlscrubber_skip: testimonials +htmlscrubber_skip: testimonials or builds # ikiwikihosting plugin # list of urls that alias to the main url @@ -226,7 +226,7 @@ blogspam_pagespec: postcomment(*) # lockedit plugin # PageSpec controlling which pages are locked -locked_pages: testimonials +locked_pages: testimonials or builds # moderatedcomments plugin # PageSpec matching users or comment locations to moderate From 39d3b99eded7b0b533a7ad579c7fc17439f0fc96 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 1 Nov 2013 11:21:51 -0400 Subject: [PATCH 050/114] disallow comments to more pages that just collect other pages --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 687341c106..dcb8108c10 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -317,8 +317,8 @@ virus_checker: clamdscan - # comments plugin # PageSpec of pages where comments are allowed comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum - and !bugs and !todo and !news and !recentchanges and !comments and !walkthrough - and !design/assistant/blog + and !bugs and !todo and !news and !tips and !recentchanges and !comments and !walkthrough + and !design/assistant/blog and !devblog # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From 750ce850f90bb9089466332935e9dfcdd82990e0 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 13 Nov 2013 23:16:29 +0000 Subject: [PATCH 051/114] commit of setup files --- ikiwiki.setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index dcb8108c10..87e1ba2143 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -30,9 +30,9 @@ cgi_wrapper: /var/www/b-git-annex/ikiwiki.cgi # mode for cgi_wrapper (can safely be made suid) cgi_wrappermode: '0755' # number of seconds to delay CGI requests when overloaded -cgi_overload_delay: '' +cgi_overload_delay: 10 # message to display when overloaded (may contain html) -cgi_overload_message: '' +cgi_overload_message: 'Little busy with polls right now. Please wait..' # rcs backend to use rcs: git # plugins to add to the default configuration From bd74153ab528d4952b57aeb267cc020a042b7859 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 14 Nov 2013 00:12:44 +0000 Subject: [PATCH 052/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 87e1ba2143..1d3d28a7d5 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -32,7 +32,7 @@ cgi_wrappermode: '0755' # number of seconds to delay CGI requests when overloaded cgi_overload_delay: 10 # message to display when overloaded (may contain html) -cgi_overload_message: 'Little busy with polls right now. Please wait..' +cgi_overload_message: 'Please wait..' # rcs backend to use rcs: git # plugins to add to the default configuration From c038dfc018a967ce5a78f0bedd8db105dbabe243 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 16 Nov 2013 22:19:25 +0000 Subject: [PATCH 053/114] speed up --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 1d3d28a7d5..f993f6dba7 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -10,6 +10,7 @@ # name of the wiki wikiname: git-annex # contact email for wiki +only_committed_changes: 1 adminemail: joey@kitenet.net # users who are wiki admins adminuser: From d49a408ffd5ea922f85becb47c9e33ecbea81353 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 16 Nov 2013 22:50:08 +0000 Subject: [PATCH 054/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index f993f6dba7..81426b034f 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -10,7 +10,7 @@ # name of the wiki wikiname: git-annex # contact email for wiki -only_committed_changes: 1 +only_committed_changes: 0 adminemail: joey@kitenet.net # users who are wiki admins adminuser: From ca086ce9921815c6486a5d53dc76066f12e9a506 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 17 Nov 2013 00:45:49 +0000 Subject: [PATCH 055/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 81426b034f..f993f6dba7 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -10,7 +10,7 @@ # name of the wiki wikiname: git-annex # contact email for wiki -only_committed_changes: 0 +only_committed_changes: 1 adminemail: joey@kitenet.net # users who are wiki admins adminuser: From 78bb5b7a16fa466895c1aa0dc05d9ab819832c3e Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 17 Nov 2013 00:47:44 +0000 Subject: [PATCH 056/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index f993f6dba7..81426b034f 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -10,7 +10,7 @@ # name of the wiki wikiname: git-annex # contact email for wiki -only_committed_changes: 1 +only_committed_changes: 0 adminemail: joey@kitenet.net # users who are wiki admins adminuser: From c085a7e32c45721454ed711f5b83aefe1fac4d1d Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 17 Nov 2013 03:15:49 +0000 Subject: [PATCH 057/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 81426b034f..f993f6dba7 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -10,7 +10,7 @@ # name of the wiki wikiname: git-annex # contact email for wiki -only_committed_changes: 0 +only_committed_changes: 1 adminemail: joey@kitenet.net # users who are wiki admins adminuser: From dd5526416659eaa8279d82acd6a6e4482123f025 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 18 Nov 2013 20:28:41 +0000 Subject: [PATCH 058/114] commit of setup files --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index f993f6dba7..542c43dd33 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -346,6 +346,7 @@ repositories: # search plugin # path to the omega cgi program omega_cgi: /usr/lib/cgi-bin/omega/omega +google_search: 1 # theme plugin # name of theme to enable From bf3db3079e7ef544b30a8b89d521f2bff56c1626 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 18 Nov 2013 20:58:53 +0000 Subject: [PATCH 059/114] commit of setup files --- ikiwiki.setup | 97 +++++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 542c43dd33..fc491a30e4 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -10,7 +10,6 @@ # name of the wiki wikiname: git-annex # contact email for wiki -only_committed_changes: 1 adminemail: joey@kitenet.net # users who are wiki admins adminuser: @@ -29,18 +28,20 @@ cgiurl: http://git-annex.branchable.com/ikiwiki.cgi # filename of cgi wrapper to generate cgi_wrapper: /var/www/b-git-annex/ikiwiki.cgi # mode for cgi_wrapper (can safely be made suid) -cgi_wrappermode: '0755' +cgi_wrappermode: 0755 # number of seconds to delay CGI requests when overloaded cgi_overload_delay: 10 # message to display when overloaded (may contain html) -cgi_overload_message: 'Please wait..' +cgi_overload_message: Please wait.. +# enable optimization of only refreshing committed changes? +only_committed_changes: 1 # rcs backend to use rcs: git # plugins to add to the default configuration add_plugins: - goodstuff - websetup -- '404' +- 404 - ikiwikihosting - branchable - recentchangesdiff @@ -80,21 +81,21 @@ underlaydir: /usr/share/ikiwiki/basewiki # display verbose messages? #verbose: 1 # log to syslog? -syslog: '1' +syslog: 1 # create output files named page/index.html? -usedirs: '1' +usedirs: 1 # use '!'-prefixed preprocessor directives? -prefix_directives: '1' +prefix_directives: 1 # use page/index.mdwn source files -indexpages: '0' +indexpages: 0 # enable Discussion pages? -discussion: '0' +discussion: 0 # name of Discussion pages discussionpage: Discussion # generate HTML5? -html5: '0' +html5: 0 # only send cookies over SSL connections? -sslcookie: '0' +sslcookie: 0 # extension to use for new pages default_pageext: mdwn # extension to use for html files @@ -106,9 +107,9 @@ timeformat: '%c' # put user pages below specified page userdir: users # how many backlinks to show before hiding excess (0 to show all) -numbacklinks: '10' +numbacklinks: 10 # attempt to hardlink source files? (optimisation for large files) -hardlink: '1' +hardlink: 1 # force ikiwiki to use a particular umask (keywords public, group or private, or a number) #umask: public # group for wrappers to run in @@ -126,7 +127,10 @@ timezone: GMT # specifies the characters that are allowed in source filenames wiki_file_chars: -[:alnum:]+/.:_ # allow symlinks in the path leading to the srcdir (potentially insecure) -allow_symlinks_before_srcdir: '0' +allow_symlinks_before_srcdir: 0 +# cookie control +cookiejar: + file: /home/b-git-annex/.ikiwiki/cookies ###################################################################### # core plugins @@ -136,11 +140,11 @@ allow_symlinks_before_srcdir: '0' # branchable plugin # Allow anyone to branch, check out, and copy this site? -branchable: '1' +branchable: 1 # Allow anyone to git push verified changes to this site? -anonpush: '1' +anonpush: 1 # Display "Branchable" link on action bar? -branchable_action: '1' +branchable_action: 1 # git plugin # git hook to generate @@ -148,7 +152,7 @@ git_wrapper: /home/b-git-annex/source.git/hooks/post-update # shell command for git_wrapper to run, in the background #git_wrapper_background_command: git push github # mode for git_wrapper (can safely be made suid) -#git_wrappermode: '06755' +#git_wrappermode: 06755 # git pre-receive hook to generate git_test_receive_wrapper: /home/b-git-annex/source.git/hooks/pre-receive # unix users whose commits should be checked by the pre-receive hook @@ -183,17 +187,17 @@ owner: http://joey.kitenet.net/ # internal hostname of this site hostname: git-annex.branchable.com # site creation datestamp -created: '1287531313' +created: 1287531313 # how many days to retain logs #log_period: 7 # disable IPv6? -ipv6_disabled: '0' +ipv6_disabled: 0 # inline plugin # enable rss feeds by default? -rss: '1' +rss: 1 # enable atom feeds by default? -atom: '1' +atom: 1 # allow rss feeds to be used? #allowrss: 0 # allow atom feeds to be used? @@ -280,12 +284,12 @@ po_link_to: default ###################################################################### # special-purpose plugins -# (osm) +# (osm, underlay) ###################################################################### # osm plugin # the default zoom when you click on the map link -#osm_default_zoom: '15' +#osm_default_zoom: 15 # the icon shown on links and on the main map #osm_default_icon: ikiwiki/images/osm.png # the alt tag of links, defaults to empty @@ -302,10 +306,15 @@ po_link_to: default # Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key #osm_google_apikey: '' +# underlay plugin +# extra underlay directories to add +#add_underlays: +#- /home/b-git-annex/wiki.underlay + ###################################################################### # web plugins -# (404, attachment, comments, editdiff, edittemplate, google, goto, -# mirrorlist, remove, rename, repolist, search, theme, userlist, +# (404, attachment, comments, editdiff, edittemplate, getsource, google, +# goto, mirrorlist, remove, rename, repolist, search, theme, userlist, # websetup, wmd) ###################################################################### @@ -325,11 +334,17 @@ comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" comments_pagename: comment_ # Interpret directives in comments? -comments_allowdirectives: '1' +comments_allowdirectives: 1 # Allow anonymous commenters to set an author name? #comments_allowauthor: 0 # commit comments to the VCS -comments_commit: '1' +comments_commit: 1 +# Restrict formats for comments to (no restriction if empty) +comments_allowformats: '' + +# getsource plugin +# Mime type for returned source. +#getsource_mimetype: text/plain; charset=utf-8 # mirrorlist plugin # list of mirrors @@ -346,6 +361,7 @@ repositories: # search plugin # path to the omega cgi program omega_cgi: /usr/lib/cgi-bin/omega/omega +# use google site search rather than internal xapian index? google_search: 1 # theme plugin @@ -371,7 +387,7 @@ websetup_unsafe: - repositories - sslcookie # show unsafe settings, read-only, in web interface? -websetup_show_unsafe: '0' +websetup_show_unsafe: 0 ###################################################################### # widget plugins @@ -420,22 +436,18 @@ directive_description_dir: ikiwiki/directive # filecheck, flattr, goodstuff, htmlbalance, localstyle, missingsite, # notifyemail, pagetemplate, parked, pingee, pinger, prettydate, # recentchanges, recentchangesdiff, relativedate, rsync, sidebar, -# smiley, sortnaturally, tag, testpagespec, trail, transient, -# typography, underlay) +# smiley, sortnaturally, tag, testpagespec, trail, transient, typography) ###################################################################### # aggregate plugin # enable aggregation to internal pages? -aggregateinternal: '1' +aggregateinternal: 1 # allow aggregation to be triggered via the web? #aggregate_webtrigger: 0 -# cookie control -cookiejar: - file: /home/b-git-annex/.ikiwiki/cookies # autoindex plugin # commit autocreated index pages -autoindex_commit: '1' +autoindex_commit: 1 # camelcase plugin # list of words to not turn into links @@ -461,7 +473,7 @@ prettydateformat: '%X, %B %o, %Y' # name of the recentchanges page recentchangespage: recentchanges # number of changes to track -recentchangesnum: '100' +recentchangesnum: 100 # rsync plugin # command to run to sync updated pages @@ -469,7 +481,7 @@ recentchangesnum: '100' # sidebar plugin # show sidebar page on all pages? -global_sidebars: '1' +global_sidebars: 1 # tag plugin # parent page tags are located under @@ -477,13 +489,8 @@ global_sidebars: '1' # autocreate new tag pages? #tag_autocreate: 1 # commit autocreated tag pages -tag_autocreate_commit: '1' +tag_autocreate_commit: 1 # typography plugin # Text::Typography attributes value -#typographyattributes: '3' - -# underlay plugin -# extra underlay directories to add -#add_underlays: -#- /home/b-git-annex/wiki.underlay +#typographyattributes: 3 From e4c6871da12bde05254e49bba27e715b10ba8bc4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Nov 2013 13:46:35 -0400 Subject: [PATCH 060/114] ban spammer --- ikiwiki.setup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index fc491a30e4..d1141c27fd 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -16,7 +16,8 @@ adminuser: - http://joey.kitenet.net/ - http://joeyh.name/ # users who are banned from the wiki -banned_users: [] +banned_users: +- https://domtheo.myopenid.com/ # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From cf997d8ede6f82b35d43255fd4a9077b62011a12 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Nov 2013 00:50:01 -0400 Subject: [PATCH 061/114] ban and IP ban spammer --- ikiwiki.setup | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index d1141c27fd..4e7ce135e4 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -18,6 +18,8 @@ adminuser: # users who are banned from the wiki banned_users: - https://domtheo.myopenid.com/ +- https://www.google.com/accounts/o8/id?id=AItOawkTn3HixU2KJIvvLXLqwYUzlDGDtYf43GE +- ip(182.253.50.245) # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From b7a19db653ba364e29ef6713af8572b118ae87e5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 26 Dec 2013 17:48:21 -0400 Subject: [PATCH 062/114] enable highlighting of some programming languages --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 4e7ce135e4..737579d30f 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -260,7 +260,7 @@ openid_cgiurl: http://git-annex.branchable.com/ikiwiki.cgi # highlight plugin # types of source files to syntax highlight -tohighlight: '' +tohighlight: '.sh .hs .pl .c' # location of highlight's filetypes.conf filetypes_conf: /etc/highlight/filetypes.conf # location of highlight's langDefs directory From 90a7173d58db660649e3629641e6c73e87ca668a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Mar 2014 14:03:07 -0400 Subject: [PATCH 063/114] disable the txt plugin due to abuse/confusion --- ikiwiki.setup | 1 - 1 file changed, 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 737579d30f..a034ae74a9 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -73,7 +73,6 @@ add_plugins: - search - shortcut - calendar -- txt # plugins to disable disable_plugins: - blogspam From 6030594f06c7be4c1f16d518dd0c91c7b5fd8fe6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 29 May 2014 13:21:15 -0400 Subject: [PATCH 064/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index a034ae74a9..c93a25c990 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -20,6 +20,7 @@ banned_users: - https://domtheo.myopenid.com/ - https://www.google.com/accounts/o8/id?id=AItOawkTn3HixU2KJIvvLXLqwYUzlDGDtYf43GE - ip(182.253.50.245) +- https://www.google.com/accounts/o8/id?id=AItOawlAx-pYJ036y2lgKtLJvXm7s-HFRBiJlZY # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From a9bebbc862c8f078a1fe74c0219b1be9fbf0167e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 29 May 2014 14:23:01 -0400 Subject: [PATCH 065/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index c93a25c990..c6377ed1ae 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -21,6 +21,7 @@ banned_users: - https://www.google.com/accounts/o8/id?id=AItOawkTn3HixU2KJIvvLXLqwYUzlDGDtYf43GE - ip(182.253.50.245) - https://www.google.com/accounts/o8/id?id=AItOawlAx-pYJ036y2lgKtLJvXm7s-HFRBiJlZY +- Balan # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From 0a527b5f22c66427e249a7d25dbb5f807f99e858 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 11 Nov 2014 21:09:49 +0000 Subject: [PATCH 066/114] commit of setup files --- .ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index 79209207da..888e88b8b5 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -2,3 +2,4 @@ command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArWtxJCzXFdGwpBOzW4vOjXOGySEVuLWlyF9qTXVPw0yoLP8H4XokgAwzdHd6/qb2kNgL8/igy1eFy7aDrXABbPzD6449lNzIYeI6bV5+jMG+pmcCGIzDasFAx9iF0cKM7+7gxlmQZZ/QvW5nc6UhbmtTThvp2TS/4qhiAXecJRsPgnMjEOayy2FVLtmB5vymtH5BrjPZxWwPDGdACqS0uh4ydvVgIt4aoeQog3cjPPg6mZ7xvDLa3mmv8MTWvsPvl3qaAICsMnWLW49PkmZx9259v3XTD2ZSathC9rqCmzWeknutbnTCLBdA4dJI54dxvQw+faNl1qJIyO1ZDJmjAQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHSsklzM1JeY8umxE/t9GJnMDTd6Jy7sFbASeSWw6BTSi+X1Qdm9VRmjTsdv26RIGzBOQdAybqO3BQj1cEZ51UJ/kTSXRzy92SUj7WuEdJu9ckOSs0sLld94b4dFLbG3bmSKBx4svUrGNJwedOOhRxXdV0rryOduy7HZVEq63q/aEquEgwfPo9bAOEhtdzVoLZco7eMSZFizLYQAPfmr9mJ3nhAcYZScPDWlLu37tqPxm9N4ZJ7syb13uSj2PcBxrDk1NXaPawg2itF1l61x1jDTLPrpQK0U24O1RI22XwQuE7P0qw63cPEuv4X9zscNgAPmtrGO3VstzovhmFxNrQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@gnu +command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC32kChnic5OETx3R2VRxFsUHXubHx4euqZ62NGcnbLU/d6TWv1pvld68fXWjItcNIjUj9MVpxJb8OtAbaRywm+y35EuaFJxtQ1SimWl49rVRl4TtKqv8m7WYVV7pt/sbIiaIkJQ5sdJGSa++EL/+WCwT0gDAizq8bEXSu+trCNTDYnlRNX5rCXFC4ojIg/zLNjLULT/d+iK02V1XGOyzIAxdBF4rZCWo6fvqgjouPFJWpc4SkgA/NjGvhW8IvZ5vQnaoE8LLuZDRV7qqjoKySo3Alun1nBVdPCHc9MCnRqE1slXVhtNqT7GRh0iXxTHQqfmzbBSrA0TrTa2sGPNMcn algernon@bombadil From 11172be7cf21227cbaa1338b2a2d5ec52016d38b Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 19 May 2015 17:28:06 -0400 Subject: [PATCH 067/114] changed adminemail to admin@branchable.com, so that emailauth messages sent by branchable are more likely to be received by users --- ikiwiki.setup | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index c6377ed1ae..becf33b607 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -10,7 +10,7 @@ # name of the wiki wikiname: git-annex # contact email for wiki -adminemail: joey@kitenet.net +adminemail: admin@branchable.com # users who are wiki admins adminuser: - http://joey.kitenet.net/ @@ -30,6 +30,8 @@ destdir: /home/b-git-annex/public_html url: http://git-annex.branchable.com # url to the ikiwiki.cgi cgiurl: http://git-annex.branchable.com/ikiwiki.cgi +# do not adjust cgiurl if CGI is accessed via different URL +reverse_proxy: 0 # filename of cgi wrapper to generate cgi_wrapper: /var/www/b-git-annex/ikiwiki.cgi # mode for cgi_wrapper (can safely be made suid) @@ -96,7 +98,7 @@ indexpages: 0 discussion: 0 # name of Discussion pages discussionpage: Discussion -# generate HTML5? +# use elements new in HTML5 like
? html5: 0 # only send cookies over SSL connections? sslcookie: 0 @@ -118,7 +120,9 @@ hardlink: 1 #umask: public # group for wrappers to run in #wrappergroup: ikiwiki -# extra library and plugin directory +# extra library and plugin directories +libdirs: [] +# extra library and plugin directory (searched after libdirs) libdir: /home/b-git-annex/.ikiwiki # environment variables ENV: {} @@ -135,11 +139,15 @@ allow_symlinks_before_srcdir: 0 # cookie control cookiejar: file: /home/b-git-annex/.ikiwiki/cookies +# set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds +useragent: ikiwiki/3.20150330 +# theme has a responsive layout? (mobile-optimized) +responsive_layout: 1 ###################################################################### # core plugins # (branchable, editpage, git, gitpush, htmlscrubber, ikiwikihosting, -# inline, link, meta, parentlinks) +# inline, link, meta, parentlinks, templatebody) ###################################################################### # branchable plugin @@ -184,7 +192,7 @@ htmlscrubber_skip: testimonials or builds # ikiwikihosting plugin # list of urls that alias to the main url #urlalias: [] -# openid of primary site owner +# openid or email of primary site owner owner: http://joey.kitenet.net/ # optional hostname of site this one was branched from #parent: '' @@ -196,6 +204,8 @@ created: 1287531313 #log_period: 7 # disable IPv6? ipv6_disabled: 0 +# redirect from http to https? +redirect_to_https: 0 # inline plugin # enable rss feeds by default? @@ -211,7 +221,7 @@ pingurl: [] ###################################################################### # auth plugins -# (anonok, blogspam, httpauth, lockedit, moderatedcomments, +# (anonok, blogspam, emailauth, httpauth, lockedit, moderatedcomments, # opendiscussion, openid, passwordauth, signinedit) ###################################################################### @@ -224,7 +234,7 @@ pingurl: [] blogspam_pagespec: postcomment(*) # options to send to blogspam server #blogspam_options: blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10 -# blogspam server XML-RPC url +# blogspam server JSON url #blogspam_server: '' # httpauth plugin @@ -261,7 +271,7 @@ openid_cgiurl: http://git-annex.branchable.com/ikiwiki.cgi # highlight plugin # types of source files to syntax highlight -tohighlight: '.sh .hs .pl .c' +tohighlight: .sh .hs .pl .c # location of highlight's filetypes.conf filetypes_conf: /etc/highlight/filetypes.conf # location of highlight's langDefs directory @@ -278,8 +288,8 @@ langdefdir: /usr/share/highlight/langDefs #po_master_language: en|English # slave languages (translated via PO files) format: ll|Langname #po_slave_languages: -#- fr|Français -#- es|Español +#- fr|Français +#- es|Español #- de|Deutsch # PageSpec controlling which pages are translatable po_translatable_pages: '' @@ -405,8 +415,12 @@ websetup_show_unsafe: 0 # calendar plugin # base of the archives hierarchy archivebase: '' -# PageSpec of pages to include in the archives; used by ikiwiki-calendar command +# PageSpec of pages to include in the archives, if option `calendar_autocreate` is true. archive_pagespec: '' +# autocreate new calendar pages? +calendar_autocreate: 1 +# if set, when building calendar pages, also build pages of year and month when no pages were published (building empty calendars). +calendar_fill_gaps: 1 # listdirectives plugin # directory in srcdir that contains directive descriptions @@ -437,10 +451,11 @@ directive_description_dir: ikiwiki/directive ###################################################################### # other plugins # (aggregate, autoindex, brokenlinks, camelcase, ddate, embed, favicon, -# filecheck, flattr, goodstuff, htmlbalance, localstyle, missingsite, -# notifyemail, pagetemplate, parked, pingee, pinger, prettydate, -# recentchanges, recentchangesdiff, relativedate, rsync, sidebar, -# smiley, sortnaturally, tag, testpagespec, trail, transient, typography) +# filecheck, flattr, goodstuff, htmlbalance, localstyle, loginselector, +# missingsite, notifyemail, pagetemplate, parked, pingee, pinger, +# prettydate, recentchanges, recentchangesdiff, relativedate, rsync, +# sidebar, smiley, sortnaturally, tag, testpagespec, trail, transient, +# typography) ###################################################################### # aggregate plugin From 45d517c4714885f2fac00a33e696d29b92fce33c Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 21 Jul 2015 15:29:20 +0000 Subject: [PATCH 068/114] commit of setup files --- .ssh/authorized_keys | 1 - 1 file changed, 1 deletion(-) diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index 888e88b8b5..79209207da 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -2,4 +2,3 @@ command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArWtxJCzXFdGwpBOzW4vOjXOGySEVuLWlyF9qTXVPw0yoLP8H4XokgAwzdHd6/qb2kNgL8/igy1eFy7aDrXABbPzD6449lNzIYeI6bV5+jMG+pmcCGIzDasFAx9iF0cKM7+7gxlmQZZ/QvW5nc6UhbmtTThvp2TS/4qhiAXecJRsPgnMjEOayy2FVLtmB5vymtH5BrjPZxWwPDGdACqS0uh4ydvVgIt4aoeQog3cjPPg6mZ7xvDLa3mmv8MTWvsPvl3qaAICsMnWLW49PkmZx9259v3XTD2ZSathC9rqCmzWeknutbnTCLBdA4dJI54dxvQw+faNl1qJIyO1ZDJmjAQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHSsklzM1JeY8umxE/t9GJnMDTd6Jy7sFbASeSWw6BTSi+X1Qdm9VRmjTsdv26RIGzBOQdAybqO3BQj1cEZ51UJ/kTSXRzy92SUj7WuEdJu9ckOSs0sLld94b4dFLbG3bmSKBx4svUrGNJwedOOhRxXdV0rryOduy7HZVEq63q/aEquEgwfPo9bAOEhtdzVoLZco7eMSZFizLYQAPfmr9mJ3nhAcYZScPDWlLu37tqPxm9N4ZJ7syb13uSj2PcBxrDk1NXaPawg2itF1l61x1jDTLPrpQK0U24O1RI22XwQuE7P0qw63cPEuv4X9zscNgAPmtrGO3VstzovhmFxNrQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@gnu -command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC32kChnic5OETx3R2VRxFsUHXubHx4euqZ62NGcnbLU/d6TWv1pvld68fXWjItcNIjUj9MVpxJb8OtAbaRywm+y35EuaFJxtQ1SimWl49rVRl4TtKqv8m7WYVV7pt/sbIiaIkJQ5sdJGSa++EL/+WCwT0gDAizq8bEXSu+trCNTDYnlRNX5rCXFC4ojIg/zLNjLULT/d+iK02V1XGOyzIAxdBF4rZCWo6fvqgjouPFJWpc4SkgA/NjGvhW8IvZ5vQnaoE8LLuZDRV7qqjoKySo3Alun1nBVdPCHc9MCnRqE1slXVhtNqT7GRh0iXxTHQqfmzbBSrA0TrTa2sGPNMcn algernon@bombadil From 6f13419d3998b24136da88c36e5fb0eef61ba5ee Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 21 Jul 2015 15:29:29 +0000 Subject: [PATCH 069/114] commit of setup files --- .ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index 79209207da..dbff40ef43 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -2,3 +2,4 @@ command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArWtxJCzXFdGwpBOzW4vOjXOGySEVuLWlyF9qTXVPw0yoLP8H4XokgAwzdHd6/qb2kNgL8/igy1eFy7aDrXABbPzD6449lNzIYeI6bV5+jMG+pmcCGIzDasFAx9iF0cKM7+7gxlmQZZ/QvW5nc6UhbmtTThvp2TS/4qhiAXecJRsPgnMjEOayy2FVLtmB5vymtH5BrjPZxWwPDGdACqS0uh4ydvVgIt4aoeQog3cjPPg6mZ7xvDLa3mmv8MTWvsPvl3qaAICsMnWLW49PkmZx9259v3XTD2ZSathC9rqCmzWeknutbnTCLBdA4dJI54dxvQw+faNl1qJIyO1ZDJmjAQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHSsklzM1JeY8umxE/t9GJnMDTd6Jy7sFbASeSWw6BTSi+X1Qdm9VRmjTsdv26RIGzBOQdAybqO3BQj1cEZ51UJ/kTSXRzy92SUj7WuEdJu9ckOSs0sLld94b4dFLbG3bmSKBx4svUrGNJwedOOhRxXdV0rryOduy7HZVEq63q/aEquEgwfPo9bAOEhtdzVoLZco7eMSZFizLYQAPfmr9mJ3nhAcYZScPDWlLu37tqPxm9N4ZJ7syb13uSj2PcBxrDk1NXaPawg2itF1l61x1jDTLPrpQK0U24O1RI22XwQuE7P0qw63cPEuv4X9zscNgAPmtrGO3VstzovhmFxNrQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@gnu +command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDCvaiagBilvHL//M48bP6IyDWSwp/Y+laPMtUjuxt614c67j7PMgLsIBiLIRHQBDZFbOU1VCJ+bEVcsoQiqD9Dhreuk3Wbb32ctdXkulGiomekoKNfoURWM7iET9EUgAOJgZpM+vcWQDkWVgV8t/h6mzLvHhtDTMXPm+nkS/vkLcHhyQ+IkmgyhxbD1MeIy0C37g3HQS7jGzHTeEyE66AP+8UFSyISrlFkAC4NSy5xEUTvqdMwpd/OoAaKKhLotvkS2TLddD6vr10kZGiaxbi67YZwcRmIHWyJONni5mo6UP7a1xgoupzUFjBiTOE0CCdgSsgtUW1u6azULYMV/S+Ns9V44YlnEtRntBjbzSvtCk1Ba1MoJeyL5SnVAEujJlEZq0iRRfpqOjgJdUJdEV4mJxWnbxLAEqPoVF4XsJH29L2FqvjsUy6ReTrB+IDgnYXQxTrJSpjrLE2+YzhM10/b+QvbffpJFWQfZaG7+0qbe2xhlusTYSmKjKm7ZMHIohP8g2YkbRCP8ph9ZoSlBUs9sx6iA6B4Aoi/hmb6kAgQ9AqZP5u3T19Vg3si7SMofCxf1ZheIGqoM1mmpUkq/3M7mIzkGUYP/5cY9tdZXUYUQ7S7TjMpeLf/ln+qlRWOV69FxFEZppZmeepsgeoyMO48aZNwU5OVdcDouqGqPVkc3RS6VVb9n9+2XeTc7MRrKtICbwuL74dn9cJVkyNho2S1/dTfhGaKDaAmx/hzkJ4e6uts9q0e+tNyUiiayX+683i68IWdXpqwsQrd+JCk66W8NcHuvpcR4ddJxB+LCuNLgSqsZmTv/7VanX7V6aqE+fqOGPLuR2xc77ZXcBYG3/MPUWuVoG20gXsDRq9g6lEkFFugEhPL6oBaDbkg5cTQrfA29bRGkK0Wz0lL1XfTPf8J/rQhqHDxb5GVYSSYEo1zpxmmfU7InSJhfG1r84/xfLIOT4wkH2OYhm/nZrdZqFcz152FWgw2IjE0icvGqX4bw/q1d+dTSnX2Qe6wdtKCDpFnOwX9J09qNy7kTo9wbSgDhZxvx837lk6jGTDz+45q+A64Ss4V6iBT6OGaKJKmFek6zepCOVxd1exPi/aEMLSFYgtu0XpkX66Df2SUfioFi1Umd3dP/ZpuTXYzErib2nQAWLwK54NSSpfVl5qE4hh8SGg3Gr5RDij1mD3sMjq3BpizkBpowl7Ilq31jW1qQ0D25dtrFMlfdeGkBNgY263dNDV0OEAnqW9Y2dQufqCH9LaxvZgkknxk6yjYR2PJATRoeU9TuEvDE0wZQELVfpUxY0xGraoxjdtraJhpg6c97zPoaG76MjhZKRwqq1Fb8gK33aQG/dfXN0v5+/+l2Jl1 richih@eudyptes From 66f20aab56a555c27647d396d81fae502adb1603 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 21 Jul 2015 15:29:37 +0000 Subject: [PATCH 070/114] commit of setup files --- .ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index dbff40ef43..c87081d311 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -3,3 +3,4 @@ command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHSsklzM1JeY8umxE/t9GJnMDTd6Jy7sFbASeSWw6BTSi+X1Qdm9VRmjTsdv26RIGzBOQdAybqO3BQj1cEZ51UJ/kTSXRzy92SUj7WuEdJu9ckOSs0sLld94b4dFLbG3bmSKBx4svUrGNJwedOOhRxXdV0rryOduy7HZVEq63q/aEquEgwfPo9bAOEhtdzVoLZco7eMSZFizLYQAPfmr9mJ3nhAcYZScPDWlLu37tqPxm9N4ZJ7syb13uSj2PcBxrDk1NXaPawg2itF1l61x1jDTLPrpQK0U24O1RI22XwQuE7P0qw63cPEuv4X9zscNgAPmtrGO3VstzovhmFxNrQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@gnu command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDCvaiagBilvHL//M48bP6IyDWSwp/Y+laPMtUjuxt614c67j7PMgLsIBiLIRHQBDZFbOU1VCJ+bEVcsoQiqD9Dhreuk3Wbb32ctdXkulGiomekoKNfoURWM7iET9EUgAOJgZpM+vcWQDkWVgV8t/h6mzLvHhtDTMXPm+nkS/vkLcHhyQ+IkmgyhxbD1MeIy0C37g3HQS7jGzHTeEyE66AP+8UFSyISrlFkAC4NSy5xEUTvqdMwpd/OoAaKKhLotvkS2TLddD6vr10kZGiaxbi67YZwcRmIHWyJONni5mo6UP7a1xgoupzUFjBiTOE0CCdgSsgtUW1u6azULYMV/S+Ns9V44YlnEtRntBjbzSvtCk1Ba1MoJeyL5SnVAEujJlEZq0iRRfpqOjgJdUJdEV4mJxWnbxLAEqPoVF4XsJH29L2FqvjsUy6ReTrB+IDgnYXQxTrJSpjrLE2+YzhM10/b+QvbffpJFWQfZaG7+0qbe2xhlusTYSmKjKm7ZMHIohP8g2YkbRCP8ph9ZoSlBUs9sx6iA6B4Aoi/hmb6kAgQ9AqZP5u3T19Vg3si7SMofCxf1ZheIGqoM1mmpUkq/3M7mIzkGUYP/5cY9tdZXUYUQ7S7TjMpeLf/ln+qlRWOV69FxFEZppZmeepsgeoyMO48aZNwU5OVdcDouqGqPVkc3RS6VVb9n9+2XeTc7MRrKtICbwuL74dn9cJVkyNho2S1/dTfhGaKDaAmx/hzkJ4e6uts9q0e+tNyUiiayX+683i68IWdXpqwsQrd+JCk66W8NcHuvpcR4ddJxB+LCuNLgSqsZmTv/7VanX7V6aqE+fqOGPLuR2xc77ZXcBYG3/MPUWuVoG20gXsDRq9g6lEkFFugEhPL6oBaDbkg5cTQrfA29bRGkK0Wz0lL1XfTPf8J/rQhqHDxb5GVYSSYEo1zpxmmfU7InSJhfG1r84/xfLIOT4wkH2OYhm/nZrdZqFcz152FWgw2IjE0icvGqX4bw/q1d+dTSnX2Qe6wdtKCDpFnOwX9J09qNy7kTo9wbSgDhZxvx837lk6jGTDz+45q+A64Ss4V6iBT6OGaKJKmFek6zepCOVxd1exPi/aEMLSFYgtu0XpkX66Df2SUfioFi1Umd3dP/ZpuTXYzErib2nQAWLwK54NSSpfVl5qE4hh8SGg3Gr5RDij1mD3sMjq3BpizkBpowl7Ilq31jW1qQ0D25dtrFMlfdeGkBNgY263dNDV0OEAnqW9Y2dQufqCH9LaxvZgkknxk6yjYR2PJATRoeU9TuEvDE0wZQELVfpUxY0xGraoxjdtraJhpg6c97zPoaG76MjhZKRwqq1Fb8gK33aQG/dfXN0v5+/+l2Jl1 richih@eudyptes +command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQo81S06S8B+SAJsDYNJHi9hs8V96LtScYYg5TrFTJj6kV7k2ll/1fHdVgZUx+hV/L/wy8Mj5Qh/w8sHVSJBwPvWchgHsqbI/2Y5522IadDHjZg4tiD9OBWeXZ2HN/l8fYkIZMsDWl3sYoDUbUsTi0GDlDKh4ylXthrNnAcm4HqDKeowkrtLPj/b7zvRFNBnRoK147H6uVFCpSpanMrYvY3kpUQih+gsM+FjzStiKLcUptCbIaHckL1716H7b7mt7gi4a+EtAC6Yw4RG7Xf9QPZmWFebG8q81LMWy121dsc+JrNzLoHVddpowC+OPrNIUl1lAJ8Eed+eRCsJKzrHCSwxz1Kd+zKlYeWFL0iMzJDeBcn0tdqxG13rZ/jF2dZlWEsoYMjQmbls9gHOh55T5sJWpu3e2rOV5M0YAAbtkdAHP5urcrDXKDaZEuBk4AmvvkC+E8/pt6NAvxuVYDYTXJX/Q0CzSr5B1fVNrS15Ym4zYVXsvqBEezzZQK9iopuuYIdXP0y8ZiENCyXlYtl70XbIwWaagDFu/xtBsCvWCI4r+4UWXInMaLXL9qHaCX3DP5o7pVYk4pQKwv/R3D0KYF3XUwxuFTvibtg/9wBm6Tllhs5Ste9/zl9rFFN+MHZSxbNMfPb1mH+icLcFYsr4iUsAu5n57vq7gHGG2EKqIb3p8ztlF6q0jms5YBPGLdq7O4oFUNd8vtp9FB1ldWtBX7bOhpGtyq5nnPyab99rd89FE+P1wrhpfQh6B8thdt/iCwKDwbc1Xk/EQltvuA8qEdF0R4VeQ42Vp62R4hyZIRWtImPi7eQK3bi63wa7N2qiOmNXuRZw0cAeuMzpf1IS6lsIKYhjOJObabh5GZpgGbEHzsYeaPCmwwHnR8rBVnqxcuf8vpHSzQ49IWitatbiO5LEV30hgH9T/XW1cB6wetSpOq4x3n7GdtlNqvMQI58n6iGTkq523FlBTneQsOP0lDVHYs1ZHdlxm/9pLLAw3ayHsc/28qu0JSjX8mjwGVZnSzar6D5OCYqohcNj/Tj7PPHYBzWPsbp0uEX0sKKJn2+UYCHsBKU+UThrOLkbvqHzqig4kGbYpYVtE/WhrmJduhy+oXcJ2pMxLHn2pKvSx81FCON1OOzb9BfqVQqnF3KMnPZavMsB8iCt5LLGVXEiYCnGr9M9Zv65csqczKEVF7bHamqoo4/zX9zR5mvVec0CeDk2Ma/9PF9hiYyH/C0bf4QFrAJmqu9HT7HfORmYnyA1NFao4K6jFJkFfoUQRgd6sIMBWrh991v+CcNZUQMci+1BZo+XAFDVXmxQzRFw+Bta0s75DhSYrFH6bovuF7cUgoXAZoiypygeVLTX9oDvTWax richih@adamantium From e7b29c79f9c48a532cbd40c7d5a6797925c7efef Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 2 Oct 2015 16:02:25 +0000 Subject: [PATCH 071/114] commit of setup files --- ikiwiki.setup | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index becf33b607..8a2f299af5 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -143,6 +143,8 @@ cookiejar: useragent: ikiwiki/3.20150330 # theme has a responsive layout? (mobile-optimized) responsive_layout: 1 +# try harder to produce deterministic output +deterministic: 0 ###################################################################### # core plugins @@ -237,6 +239,10 @@ blogspam_pagespec: postcomment(*) # blogspam server JSON url #blogspam_server: '' +# emailauth plugin +# email address to send emailauth mails as (default: adminemail) +emailauth_sender: login@branchable.com + # httpauth plugin # url to redirect to when authentication is needed #cgiauthurl: http://example.com/wiki/auth/ikiwiki.cgi From 6e3a22ac761b2bdcd92bd66879e8fb976a906d62 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 12 Mar 2016 13:52:44 -0400 Subject: [PATCH 072/114] don't alow : in filenames --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 8a2f299af5..064a6b2ecc 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -133,7 +133,7 @@ timezone: GMT # regexp of files that should be skipped #exclude: ^(*\.private|Makefile)$ # specifies the characters that are allowed in source filenames -wiki_file_chars: -[:alnum:]+/.:_ +wiki_file_chars: -[:alnum:]+/._ # allow symlinks in the path leading to the srcdir (potentially insecure) allow_symlinks_before_srcdir: 0 # cookie control From ca73e1b38f018546343ccfb6a4ec4ebeddcfa5b1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Jun 2016 15:37:28 -0400 Subject: [PATCH 073/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 064a6b2ecc..662dbea6c7 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -22,6 +22,7 @@ banned_users: - ip(182.253.50.245) - https://www.google.com/accounts/o8/id?id=AItOawlAx-pYJ036y2lgKtLJvXm7s-HFRBiJlZY - Balan +- Roksolana # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From e9b6034bd7add1d237b437b7082dbf6c7c20b3e0 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 2 Nov 2016 03:55:56 +0000 Subject: [PATCH 074/114] letsencrypt enabled --- ikiwiki.setup | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 662dbea6c7..01ae17ea4f 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -209,6 +209,8 @@ created: 1287531313 ipv6_disabled: 0 # redirect from http to https? redirect_to_https: 0 +# use Lets Encrypt to generate http certificate? +use_letsencrypt: 1 # inline plugin # enable rss feeds by default? @@ -429,6 +431,10 @@ calendar_autocreate: 1 # if set, when building calendar pages, also build pages of year and month when no pages were published (building empty calendars). calendar_fill_gaps: 1 +# img plugin +# Image formats to process (jpeg, png, gif, svg, pdf or 'everything' to accept all) +#img_allowed_formats: '' + # listdirectives plugin # directory in srcdir that contains directive descriptions directive_description_dir: ikiwiki/directive From af2c6e378353549461cba2e1b758bb9f2bea48e9 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 26 Jan 2017 07:40:25 +0000 Subject: [PATCH 075/114] letsencrypt enabled --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 01ae17ea4f..aa9ec03b31 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -209,7 +209,7 @@ created: 1287531313 ipv6_disabled: 0 # redirect from http to https? redirect_to_https: 0 -# use Lets Encrypt to generate http certificate? +# use Lets Encrypt to generate https certificate? use_letsencrypt: 1 # inline plugin From fc131771cf6f162cbff7de035f41f1b13bd70fcf Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 24 Aug 2017 07:34:12 +0000 Subject: [PATCH 076/114] letsencrypt enabled --- ikiwiki.setup | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index aa9ec03b31..185ccf1027 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -443,21 +443,14 @@ directive_description_dir: ikiwiki/directive # Should teximg use dvipng to render, or dvips and convert? #teximg_dvipng: '' # LaTeX prefix for teximg plugin -#teximg_prefix: '\documentclass{article} -# +#teximg_prefix: | +# \documentclass{article} # \usepackage[utf8]{inputenc} -# # \usepackage{amsmath} -# # \usepackage{amsfonts} -# # \usepackage{amssymb} -# # \pagestyle{empty} -# # \begin{document} -# -#' # LaTeX postfix for teximg plugin #teximg_postfix: \end{document} From 23dab81f1900692df3b9d156815aee84450816eb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Feb 2018 12:15:52 -0400 Subject: [PATCH 077/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 185ccf1027..9a80e08a51 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -23,6 +23,7 @@ banned_users: - https://www.google.com/accounts/o8/id?id=AItOawlAx-pYJ036y2lgKtLJvXm7s-HFRBiJlZY - Balan - Roksolana +- avdhusingh6497@d72e8319bb7c179778775a8b096b120fc219fbad # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From e5edd09234812f155b483d0d52adaf0f587b98ea Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 27 Feb 2018 11:28:38 -0400 Subject: [PATCH 078/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 9a80e08a51..070140d252 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -24,6 +24,7 @@ banned_users: - Balan - Roksolana - avdhusingh6497@d72e8319bb7c179778775a8b096b120fc219fbad +- marjor # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From 3852fb0075378a39ab2337671f5ed05d782c7dd5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Nov 2018 15:11:04 -0400 Subject: [PATCH 079/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 070140d252..d93d356e42 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -25,6 +25,7 @@ banned_users: - Roksolana - avdhusingh6497@d72e8319bb7c179778775a8b096b120fc219fbad - marjor +- Elina_Williams # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From f6bfb1949a73ac0ea27f271318357b4336f0b19f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 3 Dec 2018 13:37:00 -0400 Subject: [PATCH 080/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index d93d356e42..a3998a462a 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -26,6 +26,7 @@ banned_users: - avdhusingh6497@d72e8319bb7c179778775a8b096b120fc219fbad - marjor - Elina_Williams +- RannyJohns # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From 64f5f67129102af594f9ac18b99a2cd2d0592bc4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 3 Dec 2018 13:37:38 -0400 Subject: [PATCH 081/114] lock walkthrough/* to comments Spammers are repeatedly posting there and this is the only way I have to deal with it for now. Comments on the walkthrough are generally misplaced anyway. --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index a3998a462a..b895833895 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -355,7 +355,7 @@ virus_checker: clamdscan - # PageSpec of pages where comments are allowed comments_pagespec: page(*) and !*/Discussion and !ikiwiki/* and !index and !forum and !bugs and !todo and !news and !tips and !recentchanges and !comments and !walkthrough - and !design/assistant/blog and !devblog + and !design/assistant/blog and !devblog and !walkthrough/* # PageSpec of pages where posting new comments is not allowed comments_closed_pagespec: '' # Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" From ddb2ddc18b33d3ff3cecfbf31e449f289ee28020 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 30 Jul 2019 12:15:02 -0400 Subject: [PATCH 082/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index b895833895..cd2a9b1eb1 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -27,6 +27,7 @@ banned_users: - marjor - Elina_Williams - RannyJohns +- geonemax67@f507d88f591246c5ff7de3b1f7fb2823684a789b # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From 3e15a8b7ae0e56550808f4368d4331099b7928a3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 20 Sep 2019 12:10:30 -0400 Subject: [PATCH 083/114] set redirect_to_https fixes http://git-annex.branchable.com/bugs/impossible_to_login_to_the_website_at_times/ --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index cd2a9b1eb1..f4eb0ae1a9 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -213,7 +213,7 @@ created: 1287531313 # disable IPv6? ipv6_disabled: 0 # redirect from http to https? -redirect_to_https: 0 +redirect_to_https: 1 # use Lets Encrypt to generate https certificate? use_letsencrypt: 1 From cfc126c88adf2df31dcdfd7edb0d4e6f116b99c6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Nov 2019 12:38:45 -0400 Subject: [PATCH 084/114] banned user who deleted index and locked index page --- ikiwiki.setup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index f4eb0ae1a9..c91c090bfd 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -28,6 +28,7 @@ banned_users: - Elina_Williams - RannyJohns - geonemax67@f507d88f591246c5ff7de3b1f7fb2823684a789b +- VSV # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki @@ -259,7 +260,7 @@ emailauth_sender: login@branchable.com # lockedit plugin # PageSpec controlling which pages are locked -locked_pages: testimonials or builds +locked_pages: testimonials or builds or index # moderatedcomments plugin # PageSpec matching users or comment locations to moderate From e61d231fae8d9ed6d77613e2ef815aa47a4b8a0c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Feb 2020 20:38:53 -0400 Subject: [PATCH 085/114] add my email as site owner --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index c91c090bfd..77fe001120 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -15,6 +15,7 @@ adminemail: admin@branchable.com adminuser: - http://joey.kitenet.net/ - http://joeyh.name/ +- id@joeyh.name # users who are banned from the wiki banned_users: - https://domtheo.myopenid.com/ From 8ab064ea6d7298fc2a94a263f611d37f98a2f0b5 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 15 Feb 2020 00:50:53 +0000 Subject: [PATCH 086/114] commit of setup files --- ikiwiki.setup | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 77fe001120..ccf568cc89 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -133,7 +133,7 @@ libdirs: [] # extra library and plugin directory (searched after libdirs) libdir: /home/b-git-annex/.ikiwiki # environment variables -ENV: {} +#ENV: '' # time zone name timezone: GMT # regexp of normally excluded files to include @@ -192,7 +192,6 @@ gitmaster_branch: master # gitpush plugin # git repository urls that changes are pushed to git_push_to: -- git@github.com:joeyh/git-annex.git - joey@git.kitenet.net:/srv/git/git-annex # htmlscrubber plugin @@ -298,6 +297,10 @@ langdefdir: /usr/share/highlight/langDefs #multimarkdown: 0 # disable use of markdown discount? #nodiscount: 0 +# enable footnotes in Markdown (where supported)? +mdwn_footnotes: 1 +# interpret line like 'A. First item' as ordered list when using Discount? +mdwn_alpha_lists: 0 # po plugin # master language (non-PO files) @@ -343,8 +346,8 @@ po_link_to: default ###################################################################### # web plugins -# (404, attachment, comments, editdiff, edittemplate, getsource, google, -# goto, mirrorlist, remove, rename, repolist, search, theme, userlist, +# (404, attachment, comments, editdiff, edittemplate, google, goto, +# mirrorlist, remove, rename, repolist, search, theme, userlist, # websetup, wmd) ###################################################################### @@ -372,10 +375,6 @@ comments_commit: 1 # Restrict formats for comments to (no restriction if empty) comments_allowformats: '' -# getsource plugin -# Mime type for returned source. -#getsource_mimetype: text/plain; charset=utf-8 - # mirrorlist plugin # list of mirrors #mirrorlist: {} From fb55e27c7cd0433bd588a9e8356702876a0ce6c2 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 15 Feb 2020 01:05:16 +0000 Subject: [PATCH 087/114] commit of setup files --- .ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index c87081d311..fde26be544 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -1,3 +1,4 @@ +command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICfFntnesZcYz2B2T41ay45igfckXRSh5uVffkuCQkLv joey@darkstar command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA37vjmeOfUQL9EO0JFOEIHfvE1xRx0vEMaxUNtxE85kyEIfgzN8uVJ66RPQwPI18EWM4ewJ00DM+WMuW9yCZQvdIhuYJvPWHWkX/4GcFTqPvYmzy5uTKT3GqpELv4FxbFM///2ewWRMsDoS0OOjnsTidUL/yzbfUD7n1oYsFEvakngwMRgM3g+WsMPXkk2K83cTSPWs7h8FMz6LnGQZndzEgW7ezOMyE0fZk3zAPu5ThIxc+/Tj6MoRO0aPoh6Ifzdx68EnU7yD0tyiBwv/vBUR16Q4vuAvDqqFL2nYJg5erLlSHyZ93yyrCZloJk8omRbMmBc+olVMc7vT9VMdj2Bw== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArWtxJCzXFdGwpBOzW4vOjXOGySEVuLWlyF9qTXVPw0yoLP8H4XokgAwzdHd6/qb2kNgL8/igy1eFy7aDrXABbPzD6449lNzIYeI6bV5+jMG+pmcCGIzDasFAx9iF0cKM7+7gxlmQZZ/QvW5nc6UhbmtTThvp2TS/4qhiAXecJRsPgnMjEOayy2FVLtmB5vymtH5BrjPZxWwPDGdACqS0uh4ydvVgIt4aoeQog3cjPPg6mZ7xvDLa3mmv8MTWvsPvl3qaAICsMnWLW49PkmZx9259v3XTD2ZSathC9rqCmzWeknutbnTCLBdA4dJI54dxvQw+faNl1qJIyO1ZDJmjAQ== command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHSsklzM1JeY8umxE/t9GJnMDTd6Jy7sFbASeSWw6BTSi+X1Qdm9VRmjTsdv26RIGzBOQdAybqO3BQj1cEZ51UJ/kTSXRzy92SUj7WuEdJu9ckOSs0sLld94b4dFLbG3bmSKBx4svUrGNJwedOOhRxXdV0rryOduy7HZVEq63q/aEquEgwfPo9bAOEhtdzVoLZco7eMSZFizLYQAPfmr9mJ3nhAcYZScPDWlLu37tqPxm9N4ZJ7syb13uSj2PcBxrDk1NXaPawg2itF1l61x1jDTLPrpQK0U24O1RI22XwQuE7P0qw63cPEuv4X9zscNgAPmtrGO3VstzovhmFxNrQ== From 25412b0a07d51494830d5bed0ba49d6a434e1b33 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Feb 2020 11:31:51 -0400 Subject: [PATCH 088/114] ban a spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 77fe001120..1fa65470a9 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -30,6 +30,7 @@ banned_users: - RannyJohns - geonemax67@f507d88f591246c5ff7de3b1f7fb2823684a789b - VSV +- drakeorba # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From 8760fef5811433934f6e2a5c8d907ed2b4b8f8bd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 20 Feb 2020 16:09:31 -0400 Subject: [PATCH 089/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index e8145d8bb3..ab06a7644d 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -31,6 +31,7 @@ banned_users: - geonemax67@f507d88f591246c5ff7de3b1f7fb2823684a789b - VSV - drakeorba +- peter # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From c6e7a24b4431b307be644f934a7b9823a055334a Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 7 Oct 2020 16:15:42 +0000 Subject: [PATCH 090/114] commit of setup files --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index ab06a7644d..9687389c6f 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -144,6 +144,7 @@ timezone: GMT #exclude: ^(*\.private|Makefile)$ # specifies the characters that are allowed in source filenames wiki_file_chars: -[:alnum:]+/._ +wiki_file_regexp: (^[$config{wiki_file_chars}]+[:alnum:]$) # allow symlinks in the path leading to the srcdir (potentially insecure) allow_symlinks_before_srcdir: 0 # cookie control From f2029c1d268041a9285a1f982e8ff01fef15e9e9 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 7 Oct 2020 16:17:00 +0000 Subject: [PATCH 091/114] commit of setup files --- ikiwiki.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 9687389c6f..3aa5e448fc 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -144,7 +144,7 @@ timezone: GMT #exclude: ^(*\.private|Makefile)$ # specifies the characters that are allowed in source filenames wiki_file_chars: -[:alnum:]+/._ -wiki_file_regexp: (^[$config{wiki_file_chars}]+[:alnum:]$) +wiki_file_regexp: (^[-[:alnum:]+/._]+[:alnum:]$) # allow symlinks in the path leading to the srcdir (potentially insecure) allow_symlinks_before_srcdir: 0 # cookie control From f0fe539c40f09e55ec2262ecb454d18f2c46d78e Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 7 Oct 2020 16:18:28 +0000 Subject: [PATCH 092/114] commit of setup files --- ikiwiki.setup | 1 - 1 file changed, 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 3aa5e448fc..ab06a7644d 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -144,7 +144,6 @@ timezone: GMT #exclude: ^(*\.private|Makefile)$ # specifies the characters that are allowed in source filenames wiki_file_chars: -[:alnum:]+/._ -wiki_file_regexp: (^[-[:alnum:]+/._]+[:alnum:]$) # allow symlinks in the path leading to the srcdir (potentially insecure) allow_symlinks_before_srcdir: 0 # cookie control From 1b70711fc5f671803ee64ef0be9504c73ad12caa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 3 Sep 2021 11:56:58 -0400 Subject: [PATCH 093/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index ab06a7644d..b4ff18b52d 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -32,6 +32,7 @@ banned_users: - VSV - drakeorba - peter +- LazerEpilasyon # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From 6f3142a7528a7570c4c8c0fbd8bbe28790251be8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 15 May 2023 16:23:10 -0400 Subject: [PATCH 094/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index b4ff18b52d..70fccd0480 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -33,6 +33,7 @@ banned_users: - drakeorba - peter - LazerEpilasyon +- dumsdat31w # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From af87339f3348c6a80dd873639d9ccec9430ce0e7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 19 Jun 2023 11:34:32 -0400 Subject: [PATCH 095/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 70fccd0480..7e49ed3e13 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -34,6 +34,7 @@ banned_users: - peter - LazerEpilasyon - dumsdat31w +- stephenriley # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From a2320fb46dd5c3d680c3c6153ab99b216b6942a9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Jul 2023 15:15:37 -0400 Subject: [PATCH 096/114] ban spammer --- ikiwiki.setup | 1 + 1 file changed, 1 insertion(+) diff --git a/ikiwiki.setup b/ikiwiki.setup index 7e49ed3e13..9a29842883 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -35,6 +35,7 @@ banned_users: - LazerEpilasyon - dumsdat31w - stephenriley +- hipohaha # where the source of the wiki is located srcdir: /home/b-git-annex/source/doc # where to build the wiki From bd1e12206f0190f4baba6fdddf28cae1be1490f5 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 19 Jan 2024 21:26:29 +0000 Subject: [PATCH 097/114] commit of setup files --- ikiwiki.setup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 9a29842883..e3232dccd0 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -182,7 +182,7 @@ git_wrapper: /home/b-git-annex/source.git/hooks/post-update # mode for git_wrapper (can safely be made suid) #git_wrappermode: 06755 # git pre-receive hook to generate -git_test_receive_wrapper: /home/b-git-annex/source.git/hooks/pre-receive +git_test_receive_wrapper: /home/b-git-annex/source.git/hooks/pre-receive.wrapper # unix users whose commits should be checked by the pre-receive hook untrusted_committers: - ikiwiki-anon @@ -198,6 +198,7 @@ gitmaster_branch: master # gitpush plugin # git repository urls that changes are pushed to git_push_to: +- git@git.sr.ht:~joeyh/git-annex - joey@git.kitenet.net:/srv/git/git-annex # htmlscrubber plugin From 5652fa5cc4d1bd8cdbdb889b509f4d8ef59af20c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 12 Aug 2024 02:04:32 -0400 Subject: [PATCH 098/114] .forgejo: initial ci --- .forgejo/workflows/generate-tarball.yml | 81 ++++++++++++++++++++++++ .forgejo/workflows/mirror-repository.yml | 38 +++++++++++ 2 files changed, 119 insertions(+) create mode 100644 .forgejo/workflows/generate-tarball.yml create mode 100644 .forgejo/workflows/mirror-repository.yml diff --git a/.forgejo/workflows/generate-tarball.yml b/.forgejo/workflows/generate-tarball.yml new file mode 100644 index 0000000000..6a1407653e --- /dev/null +++ b/.forgejo/workflows/generate-tarball.yml @@ -0,0 +1,81 @@ +on: + workflow_dispatch: + inputs: + ref_name: + description: 'Tag or commit' + required: true + type: string + +jobs: + cabal-config-edge: + name: Generate cabal config for edge + runs-on: x86_64 + container: + image: alpine:edge + env: + CI_PROJECT_NAME: git-annex + CI_ALPINE_TARGET_RELEASE: edge + steps: + - name: Environment setup + run: apk add nodejs git cabal patch + - name: Repo pull + uses: actions/checkout@v4 + with: + fetch-depth: 500 + ref: ${{ inputs.ref_name }} + - name: Config generation + run: | + wget 'https://lab.ilot.io/mirrors/git-annex/-/raw/gitlab-ci/ghc-9.8.patch' + patch -p1 -i ghc-9.8.patch + HOME="${{ github.workspace}}"/cabal_cache cabal update + HOME="${{ github.workspace}}"/cabal_cache cabal v2-freeze --shadow-installed-packages --strong-flags --flags="+assistant +webapp +pairing +production +torrentparser +magicmime +benchmark -debuglocks +dbus +networkbsd +gitlfs +httpclientrestricted" + mv cabal.project.freeze git-annex-${{ input.ref_name }}-$CI_ALPINE_TARGET_RELEASE.config + - name: Package upload + uses: forgejo/upload-artifact@v3 + with: + name: cabal-config-${{ input.ref_name }} + path: git-annex${{ input.ref_name }}* + cabal-config-v320: + name: Generate cabal config for edge + runs-on: x86_64 + container: + image: alpine: + env: + CI_PROJECT_NAME: git-annex + CI_ALPINE_TARGET_RELEASE: v3.20 + steps: + - name: Environment setup + run: apk add nodejs git cabal patch + - name: Repo pull + uses: actions/checkout@v4 + with: + fetch-depth: 500 + ref: ${{ inputs.ref_name }} + - name: Config generation + run: | + wget 'https://lab.ilot.io/mirrors/git-annex/-/raw/gitlab-ci/ghc-9.8.patch' + patch -p1 -i ghc-9.8.patch + HOME="${{ github.workspace }}"/cabal_cache cabal update + HOME="${{ github.workspace }}"/cabal_cache cabal v2-freeze --shadow-installed-packages --strong-flags --flags="+assistant +webapp +pairing +production +torrentparser +magicmime +benchmark -debuglocks +dbus +networkbsd +gitlfs +httpclientrestricted" + mv cabal.project.freeze git-annex-${{ input.ref_name }}-$CI_ALPINE_TARGET_RELEASE.config + - name: Package upload + uses: forgejo/upload-artifact@v3 + with: + name: cabal-config-${{ input.ref_name }} + path: git-annex${{ input.ref_name }}* + upload-tarball: + name: Upload to generic repo + runs-on: x86_64 + needs: [build-tarball] + container: + image: alpine:3.20 + steps: + - name: Environment setup + run: apk add nodejs curl findutils + - name: Package download + uses: forgejo/download-artifact@v3 + - name: Package deployment + run: | + find . + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./tarball/git-annex-${{ inputs.ref_name }}.tar.gz ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-${{ inputs.ref_name}}.tar.gz + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./tarball/git-annex-${{ inputs.ref_name }}.tar.gz.sha512sum ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-${{ inputs.ref_name}}.tar.gz.sha512sum diff --git a/.forgejo/workflows/mirror-repository.yml b/.forgejo/workflows/mirror-repository.yml new file mode 100644 index 0000000000..791fe23d0e --- /dev/null +++ b/.forgejo/workflows/mirror-repository.yml @@ -0,0 +1,38 @@ +on: + workflow_dispatch: + + schedule: + - cron: '@hourly' + + push: + branches: + - 'master' + +jobs: + mirror: + name: Pull from upstream + runs-on: x86_64 + container: + image: 'docker.io/node:20-bookworm' + steps: + - name: git mirror branches {v*/,}master & tags + run: | + git init --bare . + git remote add origin https://git.joeyh.name/git/git-annex.git + git fetch origin refs/heads/master:refs/mirror/master + git ls-remote origin refs/heads/v*/master | while read sha full_ref ; do + ref=${full_ref#refs/heads/} + git fetch origin $full_ref:refs/mirror/$ref + tag=${ref%/master} + git fetch origin refs/tags/${tag}*:refs/mirror-tags/${tag}* + done + if test "${{ vars.TEST }}" != true ; then + token=${{ secrets.CODE_FORGEJO_TOKEN }} + destination=${{ vars.DESTINATION }} + owner=${{ vars.OWNER }} + else + token=${{ secrets.TEST_FORGEJO_TOKEN }} + destination=${{ vars.TEST_DESTINATION }} + owner=${{ vars.TEST_OWNER }} + fi + git push --force https://any:$token@$destination/$owner/git-annex refs/mirror/*:refs/heads/* refs/mirror-tags/*:refs/tags/* --tags From 6a68875d6a8ba3d4e5dd9096678f1e03295be407 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 12 Aug 2024 02:06:16 -0400 Subject: [PATCH 099/114] .forgejo: typo --- .forgejo/workflows/generate-tarball.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/generate-tarball.yml b/.forgejo/workflows/generate-tarball.yml index 6a1407653e..939af686ec 100644 --- a/.forgejo/workflows/generate-tarball.yml +++ b/.forgejo/workflows/generate-tarball.yml @@ -39,7 +39,7 @@ jobs: name: Generate cabal config for edge runs-on: x86_64 container: - image: alpine: + image: alpine:3.20 env: CI_PROJECT_NAME: git-annex CI_ALPINE_TARGET_RELEASE: v3.20 @@ -68,7 +68,7 @@ jobs: runs-on: x86_64 needs: [build-tarball] container: - image: alpine:3.20 + image: alpine:latest steps: - name: Environment setup run: apk add nodejs curl findutils From f834ede6b50fc3078b1725d291ec6dbd520003ce Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 12 Aug 2024 02:08:37 -0400 Subject: [PATCH 100/114] .forgejo: fix dependency --- .forgejo/workflows/generate-tarball.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/generate-tarball.yml b/.forgejo/workflows/generate-tarball.yml index 939af686ec..5a33bea5f0 100644 --- a/.forgejo/workflows/generate-tarball.yml +++ b/.forgejo/workflows/generate-tarball.yml @@ -34,7 +34,7 @@ jobs: uses: forgejo/upload-artifact@v3 with: name: cabal-config-${{ input.ref_name }} - path: git-annex${{ input.ref_name }}* + path: git-annex* cabal-config-v320: name: Generate cabal config for edge runs-on: x86_64 @@ -62,11 +62,11 @@ jobs: uses: forgejo/upload-artifact@v3 with: name: cabal-config-${{ input.ref_name }} - path: git-annex${{ input.ref_name }}* + path: git-annex* upload-tarball: name: Upload to generic repo runs-on: x86_64 - needs: [build-tarball] + needs: [cabal-config-edge,cabal-config-v320] container: image: alpine:latest steps: From 629f4181d9791da770756ac3fcccc00ad3e3776d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 12 Aug 2024 02:11:26 -0400 Subject: [PATCH 101/114] .forgejo: change title --- .forgejo/workflows/generate-tarball.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/generate-tarball.yml b/.forgejo/workflows/generate-tarball.yml index 5a33bea5f0..527eb371c4 100644 --- a/.forgejo/workflows/generate-tarball.yml +++ b/.forgejo/workflows/generate-tarball.yml @@ -33,7 +33,7 @@ jobs: - name: Package upload uses: forgejo/upload-artifact@v3 with: - name: cabal-config-${{ input.ref_name }} + name: cabalconfigedge path: git-annex* cabal-config-v320: name: Generate cabal config for edge @@ -61,7 +61,7 @@ jobs: - name: Package upload uses: forgejo/upload-artifact@v3 with: - name: cabal-config-${{ input.ref_name }} + name: cabalconfig320 path: git-annex* upload-tarball: name: Upload to generic repo From d5f3fc8626c05aabf4d64f8084ed983feb1dc892 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 12 Aug 2024 02:17:18 -0400 Subject: [PATCH 102/114] forgejo: debug conf location --- .forgejo/workflows/generate-tarball.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/generate-tarball.yml b/.forgejo/workflows/generate-tarball.yml index 527eb371c4..24a46e5746 100644 --- a/.forgejo/workflows/generate-tarball.yml +++ b/.forgejo/workflows/generate-tarball.yml @@ -29,6 +29,7 @@ jobs: patch -p1 -i ghc-9.8.patch HOME="${{ github.workspace}}"/cabal_cache cabal update HOME="${{ github.workspace}}"/cabal_cache cabal v2-freeze --shadow-installed-packages --strong-flags --flags="+assistant +webapp +pairing +production +torrentparser +magicmime +benchmark -debuglocks +dbus +networkbsd +gitlfs +httpclientrestricted" + find . mv cabal.project.freeze git-annex-${{ input.ref_name }}-$CI_ALPINE_TARGET_RELEASE.config - name: Package upload uses: forgejo/upload-artifact@v3 @@ -58,6 +59,7 @@ jobs: HOME="${{ github.workspace }}"/cabal_cache cabal update HOME="${{ github.workspace }}"/cabal_cache cabal v2-freeze --shadow-installed-packages --strong-flags --flags="+assistant +webapp +pairing +production +torrentparser +magicmime +benchmark -debuglocks +dbus +networkbsd +gitlfs +httpclientrestricted" mv cabal.project.freeze git-annex-${{ input.ref_name }}-$CI_ALPINE_TARGET_RELEASE.config + find . - name: Package upload uses: forgejo/upload-artifact@v3 with: @@ -77,5 +79,5 @@ jobs: - name: Package deployment run: | find . - curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./tarball/git-annex-${{ inputs.ref_name }}.tar.gz ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-${{ inputs.ref_name}}.tar.gz - curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./tarball/git-annex-${{ inputs.ref_name }}.tar.gz.sha512sum ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-${{ inputs.ref_name}}.tar.gz.sha512sum + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfigedge/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-edge.cabal + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig320/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex- From a8cdba442d16b256ef446a6c225cd2ab848049dd Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 12 Aug 2024 02:18:51 -0400 Subject: [PATCH 103/114] forgejo: debug conf location --- .forgejo/workflows/generate-tarball.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/generate-tarball.yml b/.forgejo/workflows/generate-tarball.yml index 24a46e5746..2101ce18e5 100644 --- a/.forgejo/workflows/generate-tarball.yml +++ b/.forgejo/workflows/generate-tarball.yml @@ -17,7 +17,7 @@ jobs: CI_ALPINE_TARGET_RELEASE: edge steps: - name: Environment setup - run: apk add nodejs git cabal patch + run: apk add nodejs git cabal patch wget - name: Repo pull uses: actions/checkout@v4 with: @@ -46,7 +46,7 @@ jobs: CI_ALPINE_TARGET_RELEASE: v3.20 steps: - name: Environment setup - run: apk add nodejs git cabal patch + run: apk add nodejs git cabal patch wget - name: Repo pull uses: actions/checkout@v4 with: From 7e0dac877202d3fca7d162cf33e2b1f945a90a0d Mon Sep 17 00:00:00 2001 From: forge Date: Thu, 5 Sep 2024 21:34:14 +0000 Subject: [PATCH 104/114] Add missing v3.20 name --- .forgejo/workflows/generate-tarball.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/generate-tarball.yml b/.forgejo/workflows/generate-tarball.yml index 2101ce18e5..a343ba60b0 100644 --- a/.forgejo/workflows/generate-tarball.yml +++ b/.forgejo/workflows/generate-tarball.yml @@ -80,4 +80,4 @@ jobs: run: | find . curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfigedge/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-edge.cabal - curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig320/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex- + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig320/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-v3.20.cabal From a5268f5c32b9dceba52b900c5e5aa6f4c1c55753 Mon Sep 17 00:00:00 2001 From: forge Date: Thu, 5 Sep 2024 21:38:20 +0000 Subject: [PATCH 105/114] Put version in file name --- .forgejo/workflows/generate-tarball.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/generate-tarball.yml b/.forgejo/workflows/generate-tarball.yml index a343ba60b0..afc91a2380 100644 --- a/.forgejo/workflows/generate-tarball.yml +++ b/.forgejo/workflows/generate-tarball.yml @@ -79,5 +79,5 @@ jobs: - name: Package deployment run: | find . - curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfigedge/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-edge.cabal - curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig320/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-v3.20.cabal + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfigedge/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-${{ inputs.ref_name }}-edge.cabal + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig320/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-${{ inputs.ref_name }}-v320.cabal From 020a43fd908d424909324658da6cacb17d5dd031 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 9 Sep 2024 19:24:23 -0400 Subject: [PATCH 106/114] Generate lockfile automatically on new tag --- .forgejo/patches/ghc-9.8.patch | 18 ++++++ ...rate-tarball.yml => generate-lockfile.yml} | 40 ++++++------ .forgejo/workflows/mirror-repository.yml | 62 +++++++++++-------- 3 files changed, 76 insertions(+), 44 deletions(-) create mode 100644 .forgejo/patches/ghc-9.8.patch rename .forgejo/workflows/{generate-tarball.yml => generate-lockfile.yml} (69%) diff --git a/.forgejo/patches/ghc-9.8.patch b/.forgejo/patches/ghc-9.8.patch new file mode 100644 index 0000000000..85796d787d --- /dev/null +++ b/.forgejo/patches/ghc-9.8.patch @@ -0,0 +1,18 @@ +Support ghc-9.8 by widening a lot of constraints. + +This patch can be removed once upstream supports ghc 9.8 offically. + +diff -uprN git-annex-10.20240227.orig/cabal.project git-annex-10.20240227/cabal.project +--- git-annex-10.20240227.orig/cabal.project 1970-01-01 01:00:00.000000000 +0100 ++++ git-annex-10.20240227/cabal.project 2024-04-28 13:30:14.061706299 +0200 +@@ -0,0 +1,10 @@ ++packages: *.cabal ++ ++allow-newer: dav ++allow-newer: haskeline:filepath ++allow-newer: haskeline:directory ++allow-newer: xml-hamlet ++allow-newer: aws:filepath ++allow-newer: dbus:network ++allow-newer: dbus:filepath ++allow-newer: microstache:filepath diff --git a/.forgejo/workflows/generate-tarball.yml b/.forgejo/workflows/generate-lockfile.yml similarity index 69% rename from .forgejo/workflows/generate-tarball.yml rename to .forgejo/workflows/generate-lockfile.yml index afc91a2380..0d98abd451 100644 --- a/.forgejo/workflows/generate-tarball.yml +++ b/.forgejo/workflows/generate-lockfile.yml @@ -6,6 +6,10 @@ on: required: true type: string + push: + tags: + - '*' + jobs: cabal-config-edge: name: Generate cabal config for edge @@ -13,58 +17,52 @@ jobs: container: image: alpine:edge env: - CI_PROJECT_NAME: git-annex CI_ALPINE_TARGET_RELEASE: edge steps: - name: Environment setup - run: apk add nodejs git cabal patch wget + run: apk add nodejs git cabal patch - name: Repo pull uses: actions/checkout@v4 with: - fetch-depth: 500 + fetch-depth: 1 ref: ${{ inputs.ref_name }} - name: Config generation run: | - wget 'https://lab.ilot.io/mirrors/git-annex/-/raw/gitlab-ci/ghc-9.8.patch' - patch -p1 -i ghc-9.8.patch + patch -p1 -i .forgejo/patches/ghc-9.8.patch HOME="${{ github.workspace}}"/cabal_cache cabal update HOME="${{ github.workspace}}"/cabal_cache cabal v2-freeze --shadow-installed-packages --strong-flags --flags="+assistant +webapp +pairing +production +torrentparser +magicmime +benchmark -debuglocks +dbus +networkbsd +gitlfs +httpclientrestricted" - find . - mv cabal.project.freeze git-annex-${{ input.ref_name }}-$CI_ALPINE_TARGET_RELEASE.config + mv cabal.project.freeze git-annex.config - name: Package upload uses: forgejo/upload-artifact@v3 with: name: cabalconfigedge - path: git-annex* + path: git-annex*.config cabal-config-v320: name: Generate cabal config for edge runs-on: x86_64 container: image: alpine:3.20 env: - CI_PROJECT_NAME: git-annex CI_ALPINE_TARGET_RELEASE: v3.20 steps: - name: Environment setup - run: apk add nodejs git cabal patch wget + run: apk add nodejs git cabal patch - name: Repo pull uses: actions/checkout@v4 with: - fetch-depth: 500 + fetch-depth: 1 ref: ${{ inputs.ref_name }} - name: Config generation run: | - wget 'https://lab.ilot.io/mirrors/git-annex/-/raw/gitlab-ci/ghc-9.8.patch' - patch -p1 -i ghc-9.8.patch + patch -p1 -i .forgejo/patches/ghc-9.8.patch HOME="${{ github.workspace }}"/cabal_cache cabal update HOME="${{ github.workspace }}"/cabal_cache cabal v2-freeze --shadow-installed-packages --strong-flags --flags="+assistant +webapp +pairing +production +torrentparser +magicmime +benchmark -debuglocks +dbus +networkbsd +gitlfs +httpclientrestricted" - mv cabal.project.freeze git-annex-${{ input.ref_name }}-$CI_ALPINE_TARGET_RELEASE.config - find . + mv cabal.project.freeze git-annex.config - name: Package upload uses: forgejo/upload-artifact@v3 with: name: cabalconfig320 - path: git-annex* + path: git-annex*.config upload-tarball: name: Upload to generic repo runs-on: x86_64 @@ -78,6 +76,10 @@ jobs: uses: forgejo/download-artifact@v3 - name: Package deployment run: | - find . - curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfigedge/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-${{ inputs.ref_name }}-edge.cabal - curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig320/git-annex.cabal ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/${{ inputs.ref_name }}/git-annex-${{ inputs.ref_name }}-v320.cabal + if test $GITHUB_REF_NAME == "ci" ; then + CI_REF_NAME=${{ inputs.ref_name }} + else + CI_REF_NAME=$GITHUB_REF_NAME + fi + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfigedge/git-annex.config ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/$CI_REF_NAME/git-annex-$CI_REF_NAME-edge.cabal + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig320/git-annex.config ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/$CI_REF_NAME/git-annex-$CI_REF_NAME-v320.cabal diff --git a/.forgejo/workflows/mirror-repository.yml b/.forgejo/workflows/mirror-repository.yml index 791fe23d0e..b820421db5 100644 --- a/.forgejo/workflows/mirror-repository.yml +++ b/.forgejo/workflows/mirror-repository.yml @@ -4,35 +4,47 @@ on: schedule: - cron: '@hourly' - push: - branches: - - 'master' - jobs: mirror: name: Pull from upstream runs-on: x86_64 container: - image: 'docker.io/node:20-bookworm' + image: alpine:latest + env: + upstream: https://git.joeyh.name/git/git-annex.git + tags: '10.2024*' steps: - - name: git mirror branches {v*/,}master & tags + - name: Environment setup + run: apk add grep git sed coreutils bash nodejs + - name: Fetch destination + uses: actions/checkout@v4 + with: + fetch_depth: 1 + ref: ci + token: ${{ secrets.CODE_FORGEJO_TOKEN }} + - name: Missing tag detecting run: | - git init --bare . - git remote add origin https://git.joeyh.name/git/git-annex.git - git fetch origin refs/heads/master:refs/mirror/master - git ls-remote origin refs/heads/v*/master | while read sha full_ref ; do - ref=${full_ref#refs/heads/} - git fetch origin $full_ref:refs/mirror/$ref - tag=${ref%/master} - git fetch origin refs/tags/${tag}*:refs/mirror-tags/${tag}* - done - if test "${{ vars.TEST }}" != true ; then - token=${{ secrets.CODE_FORGEJO_TOKEN }} - destination=${{ vars.DESTINATION }} - owner=${{ vars.OWNER }} - else - token=${{ secrets.TEST_FORGEJO_TOKEN }} - destination=${{ vars.TEST_DESTINATION }} - owner=${{ vars.TEST_OWNER }} - fi - git push --force https://any:$token@$destination/$owner/git-annex refs/mirror/*:refs/heads/* refs/mirror-tags/*:refs/tags/* --tags + git ls-remote $upstream "refs/tags/$tags" | grep -v '{' | sed 's|.*/||' > upstream_tags + git ls-remote ${{ github.server_url}}/${{ github.repository }} "refs/tags/$tags" | grep -v '{' | sed 's|.*/||' > destination_tags + cat upstream_tags destination_tags | tr ' ' '\n' | sort | uniq -u > missing_tags + echo "Missing tags:" + cat missing_tags + - name: Missing tag fetch + run: | + git remote add upstream $upstream + while read tag; do + git fetch upstream tag $tag --no-tags + done < missing_tags + - name: Packaging workflow injection + run: | + while read tag; do + git checkout $tag + git tag -d $tag + git checkout ci -- ./.forgejo + git config user.name "forgejo-actions[bot]" + git config user.email "dev@ayakael.net" + git commit -m 'Inject custom workflow' + git tag -a $tag -m $tag + done < missing_tags + - name: Push to destination + run: git push --force origin refs/tags/*:refs/tags/* --tags From 5266539427dd62a7493a6dadadb6c5083f2e67a2 Mon Sep 17 00:00:00 2001 From: forge Date: Fri, 18 Oct 2024 11:01:17 +0000 Subject: [PATCH 107/114] Use comm instead of uniq to compute missing tags --- .forgejo/workflows/mirror-repository.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/mirror-repository.yml b/.forgejo/workflows/mirror-repository.yml index b820421db5..91dc5b9452 100644 --- a/.forgejo/workflows/mirror-repository.yml +++ b/.forgejo/workflows/mirror-repository.yml @@ -24,9 +24,9 @@ jobs: token: ${{ secrets.CODE_FORGEJO_TOKEN }} - name: Missing tag detecting run: | - git ls-remote $upstream "refs/tags/$tags" | grep -v '{' | sed 's|.*/||' > upstream_tags - git ls-remote ${{ github.server_url}}/${{ github.repository }} "refs/tags/$tags" | grep -v '{' | sed 's|.*/||' > destination_tags - cat upstream_tags destination_tags | tr ' ' '\n' | sort | uniq -u > missing_tags + git ls-remote $upstream "refs/tags/$tags" | grep -v '{' | sed 's|.*/||' | sort > upstream_tags + git ls-remote ${{ github.server_url}}/${{ github.repository }} "refs/tags/$tags" | grep -v '{' | sed 's|.*/||' | sort > destination_tags + comm -23 upstream_tags destination_tags > missing_tags echo "Missing tags:" cat missing_tags - name: Missing tag fetch From 3b3f367a640bec1cf30209ebf8ef9b82bd744735 Mon Sep 17 00:00:00 2001 From: forge Date: Sun, 5 Jan 2025 17:31:08 +0000 Subject: [PATCH 108/114] Generate cabal config for v3.21 --- .forgejo/workflows/generate-lockfile.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/generate-lockfile.yml b/.forgejo/workflows/generate-lockfile.yml index 0d98abd451..9c4547cef3 100644 --- a/.forgejo/workflows/generate-lockfile.yml +++ b/.forgejo/workflows/generate-lockfile.yml @@ -37,13 +37,13 @@ jobs: with: name: cabalconfigedge path: git-annex*.config - cabal-config-v320: - name: Generate cabal config for edge + cabal-config-v321: + name: Generate cabal config for v3.21 runs-on: x86_64 container: - image: alpine:3.20 + image: alpine:3.21 env: - CI_ALPINE_TARGET_RELEASE: v3.20 + CI_ALPINE_TARGET_RELEASE: v3.21 steps: - name: Environment setup run: apk add nodejs git cabal patch @@ -61,12 +61,12 @@ jobs: - name: Package upload uses: forgejo/upload-artifact@v3 with: - name: cabalconfig320 + name: cabalconfig321 path: git-annex*.config upload-tarball: name: Upload to generic repo runs-on: x86_64 - needs: [cabal-config-edge,cabal-config-v320] + needs: [cabal-config-edge,cabal-config-v321] container: image: alpine:latest steps: @@ -82,4 +82,4 @@ jobs: CI_REF_NAME=$GITHUB_REF_NAME fi curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfigedge/git-annex.config ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/$CI_REF_NAME/git-annex-$CI_REF_NAME-edge.cabal - curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig320/git-annex.config ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/$CI_REF_NAME/git-annex-$CI_REF_NAME-v320.cabal + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig321/git-annex.config ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/$CI_REF_NAME/git-annex-$CI_REF_NAME-v321.cabal From 9fc588e1eefbe39ff02e627c609524e190d63a2a Mon Sep 17 00:00:00 2001 From: forge Date: Sun, 5 Jan 2025 17:32:42 +0000 Subject: [PATCH 109/114] Sync 10.2025* tags --- .forgejo/workflows/mirror-repository.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/mirror-repository.yml b/.forgejo/workflows/mirror-repository.yml index 91dc5b9452..f44c4668cf 100644 --- a/.forgejo/workflows/mirror-repository.yml +++ b/.forgejo/workflows/mirror-repository.yml @@ -12,7 +12,7 @@ jobs: image: alpine:latest env: upstream: https://git.joeyh.name/git/git-annex.git - tags: '10.2024*' + tags: '10.2025*' steps: - name: Environment setup run: apk add grep git sed coreutils bash nodejs From 222c727007c23c8dd28e4bea0b60518b24f39b80 Mon Sep 17 00:00:00 2001 From: forge Date: Thu, 22 May 2025 03:06:29 +0000 Subject: [PATCH 110/114] ci: upgrade in env setup --- .forgejo/workflows/generate-lockfile.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/generate-lockfile.yml b/.forgejo/workflows/generate-lockfile.yml index 9c4547cef3..663cec452c 100644 --- a/.forgejo/workflows/generate-lockfile.yml +++ b/.forgejo/workflows/generate-lockfile.yml @@ -20,7 +20,9 @@ jobs: CI_ALPINE_TARGET_RELEASE: edge steps: - name: Environment setup - run: apk add nodejs git cabal patch + run: | + apk upgrade -a + apk add nodejs git cabal patch - name: Repo pull uses: actions/checkout@v4 with: @@ -46,7 +48,9 @@ jobs: CI_ALPINE_TARGET_RELEASE: v3.21 steps: - name: Environment setup - run: apk add nodejs git cabal patch + run: | + apk upgrade -a + apk add nodejs git cabal patch - name: Repo pull uses: actions/checkout@v4 with: From 4f5641710b61a130c1a589a2952470570be2445f Mon Sep 17 00:00:00 2001 From: forge Date: Sun, 8 Jun 2025 23:48:25 +0000 Subject: [PATCH 111/114] Move to v3.22 --- .forgejo/workflows/generate-lockfile.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/generate-lockfile.yml b/.forgejo/workflows/generate-lockfile.yml index 663cec452c..6c9d347fbb 100644 --- a/.forgejo/workflows/generate-lockfile.yml +++ b/.forgejo/workflows/generate-lockfile.yml @@ -40,12 +40,12 @@ jobs: name: cabalconfigedge path: git-annex*.config cabal-config-v321: - name: Generate cabal config for v3.21 + name: Generate cabal config for v3.22 runs-on: x86_64 container: - image: alpine:3.21 + image: alpine:3.22 env: - CI_ALPINE_TARGET_RELEASE: v3.21 + CI_ALPINE_TARGET_RELEASE: v3.22 steps: - name: Environment setup run: | @@ -70,7 +70,7 @@ jobs: upload-tarball: name: Upload to generic repo runs-on: x86_64 - needs: [cabal-config-edge,cabal-config-v321] + needs: [cabal-config-edge,cabal-config-v322] container: image: alpine:latest steps: From 9d019ac36d9c6ee31e342127d492b96092ba550c Mon Sep 17 00:00:00 2001 From: forge Date: Sun, 8 Jun 2025 23:53:25 +0000 Subject: [PATCH 112/114] Fix workflow --- .forgejo/workflows/generate-lockfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/generate-lockfile.yml b/.forgejo/workflows/generate-lockfile.yml index 6c9d347fbb..ff6e24d1bb 100644 --- a/.forgejo/workflows/generate-lockfile.yml +++ b/.forgejo/workflows/generate-lockfile.yml @@ -65,7 +65,7 @@ jobs: - name: Package upload uses: forgejo/upload-artifact@v3 with: - name: cabalconfig321 + name: cabalconfig322 path: git-annex*.config upload-tarball: name: Upload to generic repo From 130d8b30d2a99f59ed1289538631d375e409abe2 Mon Sep 17 00:00:00 2001 From: forge Date: Sun, 8 Jun 2025 23:57:21 +0000 Subject: [PATCH 113/114] Fix workflow --- .forgejo/workflows/generate-lockfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/generate-lockfile.yml b/.forgejo/workflows/generate-lockfile.yml index ff6e24d1bb..a567f3b03a 100644 --- a/.forgejo/workflows/generate-lockfile.yml +++ b/.forgejo/workflows/generate-lockfile.yml @@ -86,4 +86,4 @@ jobs: CI_REF_NAME=$GITHUB_REF_NAME fi curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfigedge/git-annex.config ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/$CI_REF_NAME/git-annex-$CI_REF_NAME-edge.cabal - curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig321/git-annex.config ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/$CI_REF_NAME/git-annex-$CI_REF_NAME-v321.cabal + curl --user ${{ vars.CODE_FORGEJO_USER }}:${{ secrets.CODE_FORGEJO_TOKEN }} --upload-file ./cabalconfig322/git-annex.config ${{ github.server_url }}/api/packages/mirrors/generic/git-annex/$CI_REF_NAME/git-annex-$CI_REF_NAME-v322.cabal From 1e6080647b03aa40acffde75e8f20cd255c3ca92 Mon Sep 17 00:00:00 2001 From: forge Date: Sun, 8 Jun 2025 23:59:34 +0000 Subject: [PATCH 114/114] Fix workflow --- .forgejo/workflows/generate-lockfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/generate-lockfile.yml b/.forgejo/workflows/generate-lockfile.yml index a567f3b03a..8dbb579e67 100644 --- a/.forgejo/workflows/generate-lockfile.yml +++ b/.forgejo/workflows/generate-lockfile.yml @@ -39,7 +39,7 @@ jobs: with: name: cabalconfigedge path: git-annex*.config - cabal-config-v321: + cabal-config-v322: name: Generate cabal config for v3.22 runs-on: x86_64 container: