Answering to anarcat, and moving discussion to the discussion page

diff --git a/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn b/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
index d6340970029f9978dd2c476a83ffdd77fb47ac71..35feacb714f6d7d3355bb06eb3c2c519b653ec99 100644 (file)
--- a/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
+++ b/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
@@ -37,8 +37,6 @@ it on a remote machine, and tell Ikiwiki to use it instead of its local one. We
 will also ensure that the wiki is rendered whenever a commit is done to the git
 repository.
 
-[[!img separate-web-git-servers.svg size=400x]]
-
 # Conventions
 
 - We are building a wiki called *SITE*.

diff --git a/doc/tips/distributed_wikis.mdwn b/doc/tips/distributed_wikis.mdwn
index 73243a19ae4b4bc6ad7eee4e9ca683b51e2f2055..1d8a8f5a91bddb9167f5495ca148cac64a9b483b 100644 (file)
--- 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]]

diff --git a/doc/tips/distributed_wikis/discussion.mdwn b/doc/tips/distributed_wikis/discussion.mdwn
index 994c493f911c90d3257537ad862a8a9d3d61e90d..86708a39250576abaff18c4fdde84fd9cca78973 100644 (file)
--- a/doc/tips/distributed_wikis/discussion.mdwn
+++ b/doc/tips/distributed_wikis/discussion.mdwn
@@ -5,3 +5,18 @@ Would it work if the mirrored wiki was configured with cgiurl set to the cgiurl
 > leave the user on a page on the origin wiki when they save the edit.)
 > I've put a mention of this option in the page.
 > --[[Joey]]
+
+---
+
+### Separate ikiwiki web server, and 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]]
+>>>
+>>>> Upload: I am setting up a clone on github and asking joeyh to pull.
+>>>>
+>>>> Difference between *Separate webserver and git repository* and *Separate ikiwiki web server, and git server* : the only difference is that in the first case, the git srcdir is on the same server as the git main repository, whereas in the second case, it is present on the same server as the web server. One use case is when one as a very limited access to the server hosting the git repository, and cannot setup the git srcdir (because of, for instance, a (reasonably?) paranoid sysadmins would require the creation of a new user to own the git srcdir).
+