Static website suppport

2 files changed, 15 insertions, 15 deletions

diff --git a/ikiwiki/Makefile b/ikiwiki/Makefile
index a9499b1..7c08b33 100644
--- a/ikiwiki/Makefile
+++ b/ikiwiki/Makefile
@@ -21,7 +21,7 @@ web:
 web_deploy:
 	#git push web
 	#git annex sync
-	@rsync -avz --delete www/ blog:/var/sites/blog/www/
+	@rsync -avz --delete www/ templates:/var/sites/templates/www/
 
 post_update:
 	git config receive.denyCurrentBranch ignore
diff --git a/ikiwiki/ikiwiki.setup b/ikiwiki/ikiwiki.setup
index 2740fa0..d349203 100644
--- a/ikiwiki/ikiwiki.setup
+++ b/ikiwiki/ikiwiki.setup
@@ -6,30 +6,30 @@
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
 use IkiWiki::Setup::Standard {
-  wikiname => "Hello World!",
-  adminuser => ["user", ],
-  adminemail => 'user@example.org',
+  wikiname => "Templates",
+  admintemplates => ["templates", ],
+  adminemail => 'templates@fluxo.info',
 
   # Be sure to customise these..
   srcdir => ".",
   destdir => "www",
 
-  url => "https://user.example.org",
-  cgiurl => "https://user.example.org/ikiwiki.cgi",
+  url => "https://templates.fluxo.info",
+  cgiurl => "https://templates.fluxo.info/ikiwiki.cgi",
   #templatedir => "/usr/share/ikiwiki/templates",
   #underlaydir => "/usr/share/ikiwiki/basewiki",
 
   # Subversion stuff.
   #rcs => "svn",
-  #historyurl => "http://svn.example.org/trunk/[[file]]",
-  #diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
+  #historyurl => "http://svn.fluxo.info/trunk/[[file]]",
+  #diffurl => "http://svn.fluxo.info/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
   #svnrepo => "/svn/wiki",
   #svnpath => "trunk",
 
   # Git stuff.
   rcs => "git",
-  historyurl => "https://git.example.org/?p=user.git;a=history;f=[[file]]",
-  diffurl => "https://git.example.org/?p=user.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+  historyurl => "https://git.fluxo.info/?p=templates.git;a=history;f=[[file]]",
+  diffurl => "https://git.fluxo.info/?p=templates.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
   #gitorigin_branch => "origin",
   #gitmaster_branch => "master",
   # See https://ikiwiki.info/tips/laptop_wiki_with_git/
@@ -122,8 +122,8 @@ use IkiWiki::Setup::Standard {
   # Logging settings:
   #verbose => 1,
   syslog => 0,
-  # To link to user pages in a subdirectory of the wiki.
-  #userdir => "users",
+  # To link to templates pages in a subdirectory of the wiki.
+  #templatesdir => "templatess",
   # To create output files named page.html rather than page/index.html.
   #usedirs => 0,
   # Simple spam prevention: require an account-creation password.
@@ -167,7 +167,7 @@ use IkiWiki::Setup::Standard {
   # somewhere else.
   #omega_cgi => "/usr/lib/cgi-bin/omega/omega",
 
-  # For use with the openid plugin, to give an url to a page users
+  # For use with the openid plugin, to give an url to a page templatess
   # can use to signup for an OpenID.
   #openidsignup => "http://myopenid.com/",
 
@@ -178,7 +178,7 @@ use IkiWiki::Setup::Standard {
   #},
 
   # For use with the anonok plugin, a PageSpec specifying what
-  # pages anonymous users can edit
+  # pages anonymous templatess can edit
   #anonok_pagespec => "*",
 
   # For use with the aggregate plugin, to allow aggregation to be
@@ -212,5 +212,5 @@ use IkiWiki::Setup::Standard {
   #po_slave_languages => [ 'pt|Portuguese' ],
 
   # See http://ikiwiki.info/plugins/rsync/
-  #rsync_command => 'rsync -qa --delete . user@host:/path/to/docroot/',
+  #rsync_command => 'rsync -qa --delete . templates@host:/path/to/docroot/',
 }