aboutsummaryrefslogtreecommitdiff
path: root/doc/tips/distributed_wikis.mdwn
diff options
context:
space:
mode:
authorLouis <spalax@gresille.org>2014-04-29 09:45:13 +0200
committerLouis <spalax@gresille.org>2014-04-29 09:55:13 +0200
commit1ee0242ef334ffdde27f92e53c818b037609f11e (patch)
treeebc0619b6c2f8cf93622940754ee17358f2eb400 /doc/tips/distributed_wikis.mdwn
parentfcc8646493550f659f584ec8bd70740470ed2d32 (diff)
downloadikiwiki-1ee0242ef334ffdde27f92e53c818b037609f11e.tar
ikiwiki-1ee0242ef334ffdde27f92e53c818b037609f11e.tar.gz
Answering to anarcat, and moving discussion to the discussion page
Diffstat (limited to 'doc/tips/distributed_wikis.mdwn')
-rw-r--r--doc/tips/distributed_wikis.mdwn9
1 files changed, 1 insertions, 8 deletions
diff --git a/doc/tips/distributed_wikis.mdwn b/doc/tips/distributed_wikis.mdwn
index 73243a19a..1d8a8f5a9 100644
--- a/doc/tips/distributed_wikis.mdwn
+++ b/doc/tips/distributed_wikis.mdwn
@@ -35,18 +35,11 @@ This is the configuration described in
hosts the HTML files, the ikiwiki [[cgi]] but everything else is on
the git server.
-### Separate ikiwiki web server, and git server
-
-[[!img Hosting_Ikiwiki_and_master_git_repository_on_different_machines/separate-web-git-servers.svg size=400x]]
-[[http://spalax.fr.eu.org/separate-web-git-servers.svg]] *Could someone with admin rights upload [[this image|http://spalax.fr.eu.org/separate-web-git-servers.svg]] to [[IkiWiki|Hosting_Ikiwiki_and_master_git_repository_on_different_machines/separate-web-git-servers.svg]]? I am not allowed to do so. [[Louis|spalax]]*
+### Separate webserver and git repository, the git srcdir being hosted on the webserver
This is the configuration described in
[[tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines]]. One server hosts the web server (and the [[Ikiwiki cgi|cgi]]) and the git source dir; a second server hosts the git bare repository. This can be used when you have very limited access to the git server.
-> I don't understand how this configuration is different from the previous one, could you clarify? the image link is broken as well. [[anarcat]]
->> Sorry. I did a mistake. I hope this is more clear now. [[Louis|spalax]]
->>> I still don't understand the difference, and I can't reach the URL you have given above. Previously, to upload stuff I created a clone of the git repository and asked joeyh to pull, like [[this|todo/improve_decentralised_wikis_documentation_and_graphics/]]. --[[anarcat]]
-
### Decentralised pinger setup
[[!img ping-setup.svg size=400x]]