On migre chez Sakura VPN

diff --git a/ikiwiki.setup b/ikiwiki.setup
index cb2e354eb785ffabffb90e02d9560aaeb959eeb9..17926f2732ebaa33a5caf98f701001e645b878f2 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -10,17 +10,17 @@
 # name of the wiki
 wikiname: Chez Charles
 # contact email for wiki
-adminemail: admin@branchable.com
+adminemail: charles-website@plessy.org
 # users who are wiki admins
 adminuser:
 - charles@plessy.org
-- https://launchpad.net/~plessy
+- charles-website@plessy.org
 # users who are banned from the wiki
 banned_users: []
 # where the source of the wiki is located
-srcdir: /home/b-charles-plessy-org/source
+srcdir: /home/charles/charles.plessy.org/source
 # where to build the wiki
-destdir: /home/b-charles-plessy-org/public_html
+destdir: /home/charles/charles.plessy.org/public_html
 # base url to the wiki
 url: http://charles.plessy.org
 # url to the ikiwiki.cgi
@@ -28,7 +28,7 @@ cgiurl: http://charles.plessy.org/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-charles-plessy-org/ikiwiki.cgi
+cgi_wrapper: /home/charles/charles.plessy.org/cgi/ikiwiki.cgi
 # mode for cgi_wrapper (can safely be made suid)
 cgi_wrappermode: 0755
 # number of seconds to delay CGI requests when overloaded
@@ -44,8 +44,8 @@ add_plugins:
 - goodstuff
 - websetup
 - 404
-- ikiwikihosting
-- branchable
+#- ikiwikihosting
+#- branchable
 - recentchangesdiff
 - attachment
 - remove
@@ -110,7 +110,7 @@ hardlink: 1
 # extra library and plugin directories
 libdirs: []
 # extra library and plugin directory (searched after libdirs)
-libdir: /home/b-charles-plessy-org/.ikiwiki
+libdir: /home/charles/charles.plessy.org/ikiwiki
 # environment variables
 ENV: {}
 # time zone name
@@ -125,9 +125,9 @@ wiki_file_chars: -[:alnum:]+/.:_
 allow_symlinks_before_srcdir: 0
 # cookie control
 cookiejar:
-  file: /home/b-charles-plessy-org/.ikiwiki/cookies
+  file: /home/charles/charles.plessy.org/ikiwiki/cookies
 # set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds
-useragent: ikiwiki/3.20141017
+useragent: ikiwiki/3.20250501
 # theme has a responsive layout? (mobile-optimized)
 responsive_layout: 1
 # try harder to produce deterministic output
@@ -141,15 +141,15 @@ deterministic: 0
 
 # branchable plugin
 # Allow anyone to branch, check out, and copy this site?
-branchable: 1
+branchable: 0
 # Allow anyone to git push verified changes to this site?
 #anonpush: 0
 # Display "Branchable" link on action bar?
-branchable_action: 1
+branchable_action: 0
 
 # git plugin
 # git hook to generate
-git_wrapper: /home/b-charles-plessy-org/source.git/hooks/post-update
+git_wrapper: /home/charles/charles.plessy.org/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)
@@ -160,9 +160,9 @@ git_wrapper: /home/b-charles-plessy-org/source.git/hooks/post-update
 untrusted_committers:
 - ikiwiki-anon
 # gitweb url to show file history ([[file]] substituted)
-historyurl: http://source.charles-plessy-org.branchable.com/?p=source.git;a=history;f=[[file]];hb=HEAD
+historyurl: http://source.charles.plessy.org/?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.charles-plessy-org.branchable.com/?p=source.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]
+diffurl: http://source.charles.plessy.org/?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
@@ -178,16 +178,15 @@ htmlscrubber_skip: '*'
 
 # ikiwikihosting plugin
 # list of urls that alias to the main url
-urlalias:
-- http://charles-plessy-org.branchable.com/
-- http://charles-plessy-org.branchable.com/
-- http://www.charles.plessy.org/
+#urlalias:
+#- http://charles-plessy-org.branchable.com/
+#- http://www.charles.plessy.org/
 # openid or email of primary site owner
-owner: https://launchpad.net/~plessy
+owner: charles-website@plessy.org
 # optional hostname of site this one was branched from
 #parent: ''
 # internal hostname of this site
-hostname: charles-plessy-org.branchable.com
+hostname: charles.plessy.org
 # site creation datestamp
 created: 1294480368
 # how many days to retain logs
@@ -231,7 +230,7 @@ pingurl: []
 
 # emailauth plugin
 # email address to send emailauth mails as (default: adminemail)
-emailauth_sender: login@branchable.com
+#emailauth_sender: login@branchable.com
 
 # httpauth plugin
 # url to redirect to when authentication is needed
@@ -249,9 +248,9 @@ locked_pages: '*'
 
 # openid plugin
 # url pattern of openid realm (default is cgiurl)
-openid_realm: http://*.branchable.com/
+#openid_realm: http://*.branchable.com/
 # url to ikiwiki cgi to use for openid authentication (default is cgiurl)
-openid_cgiurl: http://charles-plessy-org.branchable.com/ikiwiki.cgi
+#openid_cgiurl: http://charles-plessy-org.branchable.com/ikiwiki.cgi
 
 # passwordauth plugin
 # a password that must be entered when signing up for an account
@@ -267,7 +266,8 @@ openid_cgiurl: http://charles-plessy-org.branchable.com/ikiwiki.cgi
 
 # highlight plugin
 # types of source files to syntax highlight
-tohighlight: .c .h .cpp .pl .py Makefile:make
+tohighlight: .c .h .cpp .pl .py
+#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
@@ -365,9 +365,9 @@ comments_allowformats: ''
 
 # repolist plugin
 # URIs of repositories containing the wiki's source
-repositories:
-- ssh://b-charles-plessy-org@charles-plessy-org.branchable.com/
-- git://charles-plessy-org.branchable.com/
+#repositories:
+#- ssh://b-charles-plessy-org@charles-plessy-org.branchable.com/
+#- git://charles-plessy-org.branchable.com/
 
 # search plugin
 # path to the omega cgi program
@@ -383,7 +383,7 @@ google_search: 0
 # list of plugins that cannot be enabled/disabled via the web interface
 websetup_force_plugins:
 - httpauth
-- openid
+#- openid
 - mdwn
 - wmd
 # list of additional setup field keys to treat as unsafe