From 411c85fc8390af786b56022f7df1c4648f1a82d4 Mon Sep 17 00:00:00 2001 From: "http://luca.pca.it/" Date: Sat, 6 Oct 2012 06:07:08 -0400 Subject: [PATCH 1/8] initial version --- doc/users/LucaCapello.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/users/LucaCapello.mdwn diff --git a/doc/users/LucaCapello.mdwn b/doc/users/LucaCapello.mdwn new file mode 100644 index 000000000..5ddccbf3d --- /dev/null +++ b/doc/users/LucaCapello.mdwn @@ -0,0 +1,5 @@ +[Debian Developer](http://wiki.debian.org/LucaCapello) + +[homepage](http://luca.pca.it) + +[write me](mailto:luca@pca.it) From 45126e941322cd214a6e7755a98431066a8aee4b Mon Sep 17 00:00:00 2001 From: "http://luca.pca.it/" Date: Sat, 6 Oct 2012 06:08:20 -0400 Subject: [PATCH 2/8] [Personal] add myself --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 8942e4045..d53351106 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -182,3 +182,4 @@ Personal sites and blogs * [Waldgarten]( http://waldgarten.greenonion.org/ ) News and documentation of a permaculture inspired neighbourhood-garden located in Hamburg, Germany. * [[OscarMorante]]'s [personal site](http://oscar.morante.eu). * [Puckspage]( http://www.puckspage.org/ ) Political and personal blog in German. The name comes from the elf out of midsummer nights dream. +* [[LucaCapello]]'s [homepage](http://luca.pca.it) From 6909f339ceb1f147fb185fe92e1b2aebedcc5d45 Mon Sep 17 00:00:00 2001 From: "http://luca.pca.it/" Date: Sat, 6 Oct 2012 07:37:17 -0400 Subject: [PATCH 3/8] add question about the lack of the language attribute --- doc/ikiwiki/directive/meta/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/ikiwiki/directive/meta/discussion.mdwn diff --git a/doc/ikiwiki/directive/meta/discussion.mdwn b/doc/ikiwiki/directive/meta/discussion.mdwn new file mode 100644 index 000000000..7c24b5e35 --- /dev/null +++ b/doc/ikiwiki/directive/meta/discussion.mdwn @@ -0,0 +1,2 @@ +Is there any reason the [language attribute](https://en.wikipedia.org/wiki/Meta_element#The_language_attribute) is not supported? +--[[LucaCapello]] From 6bdd953147f2b86d5e1ea3c176bd6df2f8563ef4 Mon Sep 17 00:00:00 2001 From: "http://luca.pca.it/" Date: Sat, 6 Oct 2012 08:13:56 -0400 Subject: [PATCH 4/8] add Git patch --- doc/ikiwiki/directive/meta/discussion.mdwn | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/doc/ikiwiki/directive/meta/discussion.mdwn b/doc/ikiwiki/directive/meta/discussion.mdwn index 7c24b5e35..108cf2bb9 100644 --- a/doc/ikiwiki/directive/meta/discussion.mdwn +++ b/doc/ikiwiki/directive/meta/discussion.mdwn @@ -1,2 +1,63 @@ Is there any reason the [language attribute](https://en.wikipedia.org/wiki/Meta_element#The_language_attribute) is not supported? --[[LucaCapello]] + +> Attached a patch against the Git repository, working on Debian ikiwiki_3.20100815.9. --[[LucaCapello]] + +----- + +
+From 680e57fd384b65e289d92054835687f3d6f3a19d Mon Sep 17 00:00:00 2001
+From: Luca Capello 
+Date: Sat, 6 Oct 2012 14:11:19 +0200
+Subject: [PATCH] IkiWiki/Plugin/meta.pm: support the language attribute
+
+---
+ IkiWiki/Plugin/meta.pm          |    9 +++++++++
+ doc/ikiwiki/directive/meta.mdwn |    4 ++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
+index 421f1dc..1a49f0c 100644
+--- a/IkiWiki/Plugin/meta.pm
++++ b/IkiWiki/Plugin/meta.pm
+@@ -102,6 +102,10 @@ sub preprocess (@) {
+ 		$pagestate{$page}{meta}{description}=$value;
+ 		# fallthrough
+ 	}
++	elsif ($key eq 'language') {
++		$pagestate{$page}{meta}{language}=$value;
++		# fallthrough
++	}
+ 	elsif ($key eq 'guid') {
+ 		$pagestate{$page}{meta}{guid}=$value;
+ 		# fallthrough
+@@ -279,6 +283,11 @@ sub preprocess (@) {
+ 		push @{$metaheaders{$page}}, '';
+ 	}
++	elsif ($key eq 'language') {
++		push @{$metaheaders{$page}},
++			'';
++	}
+ 	elsif ($key eq 'name') {
+ 		push @{$metaheaders{$page}}, scrub('

From 9538d7f87f901fc4c22abdcf35a8f82efeb2d718 Mon Sep 17 00:00:00 2001
From: "http://openid.ppke.hu/cstamas" 
Date: Sun, 7 Oct 2012 15:46:17 -0400
Subject: [PATCH 5/8] thx

---
 doc/bugs/ipv6_address_in_comments.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/bugs/ipv6_address_in_comments.mdwn b/doc/bugs/ipv6_address_in_comments.mdwn
index 5e535b919..90391650a 100644
--- a/doc/bugs/ipv6_address_in_comments.mdwn
+++ b/doc/bugs/ipv6_address_in_comments.mdwn
@@ -15,3 +15,5 @@ the problem for me. Not sure if this is the best solution. --[[cstamas]]
 [[!tag ipv6]]
 
 > [[done]] --[[Joey]] 
+
+> > Thank you! --[[cstamas]]

From 5e181584b148c3d668729b790f6fa3303140bf27 Mon Sep 17 00:00:00 2001
From: "http://luca.pca.it/" 
Date: Sun, 7 Oct 2012 20:24:46 -0400
Subject: [PATCH 6/8] add patch tag

---
 doc/ikiwiki/directive/meta/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ikiwiki/directive/meta/discussion.mdwn b/doc/ikiwiki/directive/meta/discussion.mdwn
index 108cf2bb9..ed5618b25 100644
--- a/doc/ikiwiki/directive/meta/discussion.mdwn
+++ b/doc/ikiwiki/directive/meta/discussion.mdwn
@@ -3,6 +3,8 @@ Is there any reason the [language attribute](https://en.wikipedia.org/wiki/Meta_
 
 > Attached a patch against the Git repository, working on Debian ikiwiki_3.20100815.9. --[[LucaCapello]]
 
+[[patch]]
+
 -----
 
 

From 1314e8c09604a704bdd530b9e55fefc80f3e35f7 Mon Sep 17 00:00:00 2001
From: jp 
Date: Mon, 8 Oct 2012 18:37:23 -0400
Subject: [PATCH 7/8]

---
 doc/forum/Multiple_urls.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/Multiple_urls.mdwn

diff --git a/doc/forum/Multiple_urls.mdwn b/doc/forum/Multiple_urls.mdwn
new file mode 100644
index 000000000..03125d27c
--- /dev/null
+++ b/doc/forum/Multiple_urls.mdwn
@@ -0,0 +1,8 @@
+Hi,
+Is there a way of making a given ikiwiki instance accessible both from the LAN where it's server is and from the WAN?
+
+Say I have ikiwiki installed on a server connected to a router. That router has  port forwarding and dyndns configured so I could open ikiwiki from outside the LAN. Trying to open normal ikiwiki pages, from outside the LAN, or with a proxy, works. However, the Editing and Preferences pages, for example, redirect to http://192.168.x.x/~username/ikiwiki/ikiwiki.cgi?page=posts%2Fhello_world&do=edit (in the case of the edit page), which of course only exists inside the LAN, and fails loading.
+
+Editing the "url" and "cgiurl" directives in the .setup file to point to the dyndns address makes it work from the outside, but I can't edit the pages from inside the LAN anymore with this configuration. The normal pages, once again, are accessible. Edit or Preferences, on the other hand, redirect to the public address, which I can't open from inside the same LAN it points to.
+
+For this reason I ask, is there an way to have multiple urls point to the same ikiwiki page, namely a LAN IP url and a public IP one? Thanks in advance.

From 9b3a8e93c327a6c45be97ebe34ac1669e09c82c5 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 8 Oct 2012 22:02:10 -0400
Subject: [PATCH 8/8] Added a comment: A Few Ways To Do This

---
 ..._e4c1256346d5a421161c20e344d8bada._comment | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 doc/forum/Multiple_urls/comment_1_e4c1256346d5a421161c20e344d8bada._comment

diff --git a/doc/forum/Multiple_urls/comment_1_e4c1256346d5a421161c20e344d8bada._comment b/doc/forum/Multiple_urls/comment_1_e4c1256346d5a421161c20e344d8bada._comment
new file mode 100644
index 000000000..9806f5376
--- /dev/null
+++ b/doc/forum/Multiple_urls/comment_1_e4c1256346d5a421161c20e344d8bada._comment
@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="60.241.8.244"
+ subject="A Few Ways To Do This"
+ date="2012-10-09T02:02:09Z"
+ content="""
+I don't think one can alter IkiWiki to have multiple URLs, because the URL is built in to the CGI when the CGI is generated.
+
+1. Use the external hostname (say, foo.com) for the URL, and tell your local machine that foo.com has an IP of 192.168.x.x, thus making it accessible from within the LAN.
+2. Give the URL as a relative-absolute URL; that is, rather than \"http://foo.com/ikiwiki.cgi\" give it as \"/ikiwiki.cgi\". This doesn't always work, though.
+3. Build two versions of the site from the same git repo. One for access from inside, and one for access from outside. Both setup files would need to be identical, apart from
+
+    * the destination directory
+    * the URLs
+    * the git-update file name; one would need to call it something other than post-update.
+    
+    Then one would make a new \"post-update\" file which calls *both* of the ikiwiki post-update scripts, so that both versions of the site are updated when you make a change.
+    Then set up your web-server to point to the \"external\" directory for the external site, and the \"internal\" directory for the internal site; easy enough to do if you use virtual hosts.
+
+Yes, I know the third one is somewhat complex... I use the idea myself in order to make two versions of a site where one is editable and the other is not, but that's not what you're aiming for, I know.
+
+"""]]