Updates URLs

3 files changed, 8 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 924bc23..8ca479f 100644
--- a/Makefile
+++ b/Makefile
@@ -19,3 +19,5 @@ web:
 
 web_deploy:
 	@rsync -avz --delete www/ firma:/var/sites/firma/www/
+
+publish: web web_deploy
diff --git a/ikiwiki.setup b/ikiwiki.setup
index cbf3b4e..3fa8d2f 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -8,14 +8,14 @@
 use IkiWiki::Setup::Standard {
   wikiname => "Firma: encrypted mailing list manager",
   adminuser => ["firma", ],
-  adminemail => 'firma@sarava.org',
+  adminemail => 'firma@fluxo.info',
 
   # Be sure to customise these..
   srcdir => ".",
   destdir => "www",
 
-  url => "https://firma.sarava.org",
-  cgiurl => "https://firma.sarava.org/ikiwiki.cgi",
+  url => "https://firma.fluxo.info",
+  cgiurl => "https://firma.fluxo.info/ikiwiki.cgi",
   #templatedir => "/usr/share/ikiwiki/templates",
   #underlaydir => "/usr/share/ikiwiki/basewiki",
 
@@ -28,8 +28,8 @@ use IkiWiki::Setup::Standard {
 
   # Git stuff.
   rcs => "git",
-  historyurl => "https://git.sarava.org/?p=firma.git;a=history;f=[[file]]",
-  diffurl => "https://git.sarava.org/?p=firma.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+  historyurl => "https://git.fluxo.info/firma/log/[[file]]",
+  diffurl => 'https://git.fluxo.info/firma/commit/[[file]]?id=[[sha1_commit]]',
   #gitorigin_branch => "origin",
   #gitmaster_branch => "master",
   # See https://ikiwiki.info/tips/laptop_wiki_with_git/
diff --git a/index.mdwn b/index.mdwn
index 80fed5d..bda65a3 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -20,7 +20,7 @@ Index
 Getting the code
 ----------------
 
-    git clone git://git.fluxo.info/firma.git
+    git clone https//git.fluxo.info/firma
 
 About
 -----