test alternative header link name

[git.ikiwiki.info.git] / doc / tips / laptop_wiki_with_git / discussion.mdwn

diff --git a/doc/tips/laptop_wiki_with_git/discussion.mdwn b/doc/tips/laptop_wiki_with_git/discussion.mdwn
index 16e48138359ba7fa5bbf4a4f2f914110f8e64bb9..fd5409ea52940c39265b633863b3c5d1348aca60 100644 (file)
--- a/doc/tips/laptop_wiki_with_git/discussion.mdwn
+++ b/doc/tips/laptop_wiki_with_git/discussion.mdwn
@@ -1,3 +1,8 @@
+I have tried `gitorigin_branch:` and it does not seem to work. I have to use `gitorigin_branch: ''` to literally set it to empty string to make it work.
+[[newton108]]
+
+----
+

 I have followed this idea along, and it seems to work pretty well. 
 Now I have a question as a git newbie. Can I have the post-commit hook on the server use something like rsync to update the files on a third machine hosting the web server?  The web server does not have git (cretins!). Of course I could just run a cron job.
 
 I have followed this idea along, and it seems to work pretty well. 
 Now I have a question as a git newbie. Can I have the post-commit hook on the server use something like rsync to update the files on a third machine hosting the web server?  The web server does not have git (cretins!). Of course I could just run a cron job.
 


@@ -11,6 +16,8 @@ Or, was this last remark about rebuilding after pulling meant to apply to rebuil
 > Of course you don't need a web server on the laptop. It is useful for
 > previewing pages before publishing them though. --[[Joey]]
 
 > Of course you don't need a web server on the laptop. It is useful for
 > previewing pages before publishing them though. --[[Joey]]
 

+----
+

 I have followed this idea too, however after pushing to the server running gitk in the scrdir shows that the remotes/origin/master branch is newer than the master. Is this normal? Have I reset the master branch to remotes/origin/master then every time when someone pushed something (and run ikiwiki -setup afterwards?)
 [[Micheal]]
 
 I have followed this idea too, however after pushing to the server running gitk in the scrdir shows that the remotes/origin/master branch is newer than the master. Is this normal? Have I reset the master branch to remotes/origin/master then every time when someone pushed something (and run ikiwiki -setup afterwards?)
 [[Micheal]]
 


@@ -23,3 +30,7 @@ Managing two setup files (one for the server and one for the laptop) is however
 One solution is to allow multiple use of `--setup` on the command line : the first is the main setup file (the one from the server, e.g. `main.setup`) and the second is the specificities of the laptop clone (e.g `laptop.setup`). In such a situation ikiwiki is called with `ikiwiki --setup main.setup` on the server and `ikiwiki --setup main.setup --setup laptop.setup` on the laptop (merging both configuration data in order).
 
 This solution seems to work, but are there any bad side effects which I miss doing that (I thought that in IkiWiki code only one setupfile is keeped) ? --[[bbb]]
 One solution is to allow multiple use of `--setup` on the command line : the first is the main setup file (the one from the server, e.g. `main.setup`) and the second is the specificities of the laptop clone (e.g `laptop.setup`). In such a situation ikiwiki is called with `ikiwiki --setup main.setup` on the server and `ikiwiki --setup main.setup --setup laptop.setup` on the laptop (merging both configuration data in order).
 
 This solution seems to work, but are there any bad side effects which I miss doing that (I thought that in IkiWiki code only one setupfile is keeped) ? --[[bbb]]

+
+Unfortunatley that does not fully work, as soon as `cgi_wrapper` is defined in setup file since each time ikiwiki reads a setup file it adds (not replace) a wrapper in `$config{wrappers}`.
+
+I am still trying to find an idea to share config data through server and laptop. --[[bbb]]