aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--ikiwiki.setup22
2 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 7fb2cc6f29f..cefbfe62500 100644
--- a/Makefile
+++ b/Makefile
@@ -18,4 +18,4 @@ web:
@ikiwiki --setup ikiwiki.setup
web_deploy:
- @rsync -avz --delete www/ blog:/var/sites/blog/www/
+ @rsync -avz --delete ./ arquivo:/var/cache/sites/arquivo/
diff --git a/ikiwiki.setup b/ikiwiki.setup
index 2740fa0546b..5a86a9a7c99 100644
--- a/ikiwiki.setup
+++ b/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 => "Arquivo Público de Memória Coletiva",
+ adminuser => ["arquivo", ],
+ adminemail => 'arquivo@sarava.org',
# Be sure to customise these..
srcdir => ".",
- destdir => "www",
+ destdir => ".",
- url => "https://user.example.org",
- cgiurl => "https://user.example.org/ikiwiki.cgi",
+ url => "https://arquivo.sarava.org",
+ #cgiurl => "https://arquivo.sarava.org/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.sarava.org/trunk/[[file]]",
+ #diffurl => "http://svn.sarava.org/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.sarava.org/?p=arquivo.git;a=history;f=[[file]]",
+ diffurl => "https://git.sarava.org/?p=arquivo.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/
@@ -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 . arquivo:/var/cache/sites/arquivo/',
}