Update setup

diff --git a/Makefile b/Makefile
index 691d74fe881c961336b382e1db03d1a151f1c76f..06ee3b330119b06d2c29a533ad4581caf0d7d408 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,13 @@
+HOSTNAME:=$(shell hostname -f)
 DESTDIR=$(HOME)/public_html/lintarget
+ifneq ($(HOSTNAME),rtime.felk.cvut.cz)
+disableplugin = rsync
+endif
 
 IKIWIKI_OPTS = --setup ikiwiki.setup --libdir=$(CURDIR)/libdir \
               --set srcdir=$(CURDIR) --set destdir=$(DESTDIR) \
-              $(addprefix --set git_wrapper=,$(wildcard /home/ocera/lib/lintarget-web-post-update))
+              $(addprefix --set git_wrapper=,$(wildcard /home/ocera/lib/lintarget-web-post-update)) \
+              $(addprefix --disable-plugin=,$(disableplugin))
 
 all:
        ikiwiki $(IKIWIKI_OPTS)

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 366c92ba583ed75f422752cbaef1d85cb63cb02c..99c387afe115fd97f7fbcf5d1127e5113e10df76 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -16,31 +16,27 @@ adminuser: []
 # users who are banned from the wiki
 banned_users: []
 # where the source of the wiki is located
-srcdir: ''
+srcdir: /home/ocera/ert_linux_web
 # where to build the wiki
-destdir: ''
+destdir: /home/ocera/public_html/lintarget
 # base url to the wiki
-url: 'http://lintarget.sourceforge.net/'
+url: http://lintarget.sourceforge.net/
 # url to the ikiwiki.cgi
 cgiurl: ''
 # filename of cgi wrapper to generate
 cgi_wrapper: ''
 # mode for cgi_wrapper (can safely be made suid)
 cgi_wrappermode: 06755
-# number of seconds to delay CGI requests when overloaded
-cgi_overload_delay: ''
-# message to display when overloaded (may contain html)
-cgi_overload_message: ''
-# enable optimization of only refreshing committed changes?
-only_committed_changes: 0
 # rcs backend to use
-rcs: ''
+rcs: git
 # plugins to add to the default configuration
 add_plugins:
-  - html
-  - toc
+- html
+- toc
+- rsync
 # plugins to disable
-disable_plugins: []
+disable_plugins:
+- recentchanges
 # additional directory to search for template files
 templatedir: /usr/share/ikiwiki/templates
 # base wiki source location
@@ -82,7 +78,7 @@ hardlink: 0
 # group for wrappers to run in
 #wrappergroup: ikiwiki
 # extra library and plugin directory
-libdir: ''
+libdir: /home/ocera/ert_linux_web/libdir
 # environment variables
 ENV: {}
 # time zone name
@@ -90,22 +86,37 @@ ENV: {}
 # regexp of normally excluded files to include
 #include: ^\.htaccess$
 # regexp of files that should be skipped
-#exclude: ^(*\.private|Makefile)$
+exclude: ^(.*\.private|Makefile|ikiwiki.setup)$
 # 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
-# cookie control
-cookiejar:
-  file: /home/wsh/.ikiwiki/cookies
-# set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds
-#useragent: Wget/1.13.4 (linux-gnu)
 
 ######################################################################
 # core plugins
-#   (editpage, htmlscrubber, inline, link, meta, parentlinks)
+#   (editpage, git, htmlscrubber, inline, link, meta, parentlinks)
 ######################################################################
 
+# git plugin
+# git hook to generate
+git_wrapper: /home/ocera/lib/lintarget-web-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://git.example.com/gitweb.cgi?p=wiki.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://git.example.com/gitweb.cgi?p=wiki.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'
@@ -191,8 +202,8 @@ pingurl: []
 #po_master_language: en|English
 # slave languages (translated via PO files) format: ll|Langname
 #po_slave_languages:
-#- fr|FranÃ\83§ais
-#- es|EspaÃ\83±ol
+#- fr|Français
+#- es|Español
 #- de|Deutsch
 # PageSpec controlling which pages are translatable
 #po_translatable_pages: '* and !*/Discussion'
@@ -201,7 +212,7 @@ pingurl: []
 
 ######################################################################
 # special-purpose plugins
-#   (osm, underlay)
+#   (osm)
 ######################################################################
 
 # osm plugin
@@ -215,18 +226,6 @@ pingurl: []
 #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: ''
-
-# underlay plugin
-# extra underlay directories to add
-#add_underlays:
-#- /home/wsh/wiki.underlay
 
 ######################################################################
 # web plugins
@@ -275,8 +274,6 @@ pingurl: []
 # 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
 # name of theme to enable
@@ -337,7 +334,8 @@ pingurl: []
 #    filecheck, flattr, goodstuff, htmlbalance, localstyle, notifyemail,
 #    pagetemplate, pingee, pinger, prettydate, recentchanges,
 #    recentchangesdiff, relativedate, rsync, sidebar, smiley,
-#    sortnaturally, tag, testpagespec, trail, transient, typography)
+#    sortnaturally, tag, testpagespec, trail, transient, typography,
+#    underlay)
 ######################################################################
 
 # aggregate plugin
@@ -345,6 +343,9 @@ pingurl: []
 #aggregateinternal: 1
 # allow aggregation to be triggered via the web?
 #aggregate_webtrigger: 0
+# cookie control
+cookiejar:
+  file: /home/wsh/.ikiwiki/cookies
 
 # autoindex plugin
 # commit autocreated index pages
@@ -375,6 +376,7 @@ recentchangesnum: 100
 # rsync plugin
 # command to run to sync updated pages
 #rsync_command: rsync -qa --delete . user@host:/path/to/docroot/
+rsync_command: rsync -qa --delete . ocerabot2,lintarget@web.sourceforge.net:htdocs/
 
 # sidebar plugin
 # show sidebar page on all pages?
@@ -391,3 +393,8 @@ recentchangesnum: 100
 # typography plugin
 # Text::Typography attributes value
 #typographyattributes: 3
+
+# underlay plugin
+# extra underlay directories to add
+#add_underlays:
+#- /home/ocera/wiki.underlay