# HG changeset patch # User Dirk Olmes # Date 1451778842 -3600 # Node ID 8de1cc117d891aa0deeadb80b1579d35bc08ef2e # Parent f6690e50793c26a65015066ff0f8a25cd8530a83# Parent ff642c382b2b3e5e134a8862bb53ff01c480cffd merge changes from default branch diff -r ff642c382b2b -r 8de1cc117d89 content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/0.md --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/0.md Sun Jan 03 00:54:02 2016 +0100 @@ -0,0 +1,5 @@ +Title: +Author: jokraehe +Date: 2014-02-12 21:30:49 + +i have the exact same issue as you described above. do you have any solution to share yet? diff -r ff642c382b2b -r 8de1cc117d89 content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/1.md --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/1.md Sun Jan 03 00:54:02 2016 +0100 @@ -0,0 +1,6 @@ +Title: +Author: Dirk Olmes +Date: 2014-02-15 16:30:00 +ReplyTo: 0md + +I dug to the root cause of the issue back after I wrote the blog post but didn't find the time to do a proper comparison of ikec's behaviour on the pi vs on my regular Linux machine. Long story short, it was the code that parses the config file. On the pi it doesn't proplerly detect the last entry in the file - or EOF, I don't remember the details. The workaround was to add an empty line to the end of the config file. diff -r ff642c382b2b -r 8de1cc117d89 content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/2.md --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/2.md Sun Jan 03 00:54:02 2016 +0100 @@ -0,0 +1,6 @@ +Title: +Author: Nkolay Dimitrov +Date: 2015-10-31 22:13:37 + +Thank you very much for this comment! It really helped me work around this issue. + diff -r ff642c382b2b -r 8de1cc117d89 content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/52fbd9f970ac0 --- a/content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/52fbd9f970ac0 Sun Jan 03 00:53:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -Author: jokraehe -Date: 2014-02-12 21:30:49 - -i have the exact same issue as you described above. do you have any solution to share yet? diff -r ff642c382b2b -r 8de1cc117d89 content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/reply1 --- a/content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/reply1 Sun Jan 03 00:53:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -Author: Dirk Olmes -Date: 2014-02-15 16:30:00 - -I dug to the root cause of the issue back after I wrote the blog post but didn't find the time to do a proper comparison of ikec's behaviour on the pi vs on my regular Linux machine. Long story short, it was the code that parses the config file. On the pi it doesn't proplerly detect the last entry in the file - or EOF, I don't remember the details. The workaround was to add an empty line to the end of the config file. \ No newline at end of file diff -r ff642c382b2b -r 8de1cc117d89 content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/reply2 --- a/content/comments/compiling-the-shrew-soft-vpn-client-on-raspberry-pi/reply2 Sun Jan 03 00:53:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -Author: Nkolay Dimitrov -Date: 2015-10-31 22:13:37 - -Thank you very much for this comment! It really helped me work around this issue. - diff -r ff642c382b2b -r 8de1cc117d89 content/comments/fair-traffic-queueing-using-fq_codel/0.md --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/comments/fair-traffic-queueing-using-fq_codel/0.md Sun Jan 03 00:54:02 2016 +0100 @@ -0,0 +1,5 @@ +Title: +Author: Dirk Olmes +Date: 2015-05-12 15:21:18 + +You can go even one step further and make the codel packet scheduler the default one for all network connections. Just use sysctl -w net.core.default_qdisc=fq_codel diff -r ff642c382b2b -r 8de1cc117d89 content/comments/fair-traffic-queueing-using-fq_codel/1 --- a/content/comments/fair-traffic-queueing-using-fq_codel/1 Sun Jan 03 00:53:23 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -Author: Dirk Olmes -Date: 2015-05-12 15:21:18 - -You can go even one step further and make the codel packet scheduler the default one for all network connections. Just use sysctl -w net.core.default_qdisc=fq_codel \ No newline at end of file diff -r ff642c382b2b -r 8de1cc117d89 content/pages/about.md --- a/content/pages/about.md Sun Jan 03 00:53:23 2016 +0100 +++ b/content/pages/about.md Sun Jan 03 00:54:02 2016 +0100 @@ -5,7 +5,7 @@ I've had interest in computers ever since I turned 15 or so. My first machine was a [Commodore 64](https://en.wikipedia.org/wiki/Commodore_64), mostly for playing computer games. But I did a bit of BASIC programming, too. -The second machine I owned was a [Sharp MZ 3500](https://en.wikipedia.org/wiki/Sharp_MZ) which I was abandoned at my dad's workplace. Since there were no games available for that machine, I turned to programming - more BASIC [dBASE](https://en.wikipedia.org/wiki/DBase), and [Turbo Pascal](https://en.wikipedia.org/wiki/Turbo_Pascal). +The second machine I owned was a [Sharp MZ 3500](https://en.wikipedia.org/wiki/Sharp_MZ) that was abandoned at my dad's workplace. Since there were no games available for that machine, I turned to programming - more BASIC [dBASE](https://en.wikipedia.org/wiki/DBase), and [Turbo Pascal](https://en.wikipedia.org/wiki/Turbo_Pascal). Later, I got in touch with [NeXTSTEP](https://en.wikipedia.org/wiki/NeXTSTEP) but I never owned one of these stylish black boxes. However, hacking [Objective-C](https://en.wikipedia.org/wiki/Objective-C) really opened my mind to object oritented programming. diff -r ff642c382b2b -r 8de1cc117d89 pelicanconf.py --- a/pelicanconf.py Sun Jan 03 00:53:23 2016 +0100 +++ b/pelicanconf.py Sun Jan 03 00:54:02 2016 +0100 @@ -12,15 +12,11 @@ DEFAULT_DATE_FORMAT = u'%d.%m.%Y' TYPOGRIFY = True -PLUGIN_PATHS = ['../simple_comments'] -#PLUGINS = ['simple_comments', 'pelicaptcha'] -PLUGINS = ['simple_comments'] +PLUGIN_PATHS = ['../pelican-plugins/pelican_comment_system'] +PLUGINS = ['pelican_comment_system'] -# simple_comments plugin config -COMMENT_PATH = 'comments' - -# pelicaptcha plugin config -PELICAPTCHA_FONT = '/usr/share/tuxpaint/fonts/FreeMono.ttf' +# pelican_comment_system plugin config +PELICAN_COMMENT_SYSTEM = True # this theme looks ok but has some downsides: # - tag list at the bottom only diff -r ff642c382b2b -r 8de1cc117d89 themes/tuxlite_tbs/templates/add_comment.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/tuxlite_tbs/templates/add_comment.html Sun Jan 03 00:54:02 2016 +0100 @@ -0,0 +1,35 @@ +
+
+ Leave a comment +
+{% if False %} +
+{% endif %} + + + + + + + + + + + + + + + +
+ Your name: + + +
+ Comment: + + +
+ +
+
+
diff -r ff642c382b2b -r 8de1cc117d89 themes/tuxlite_tbs/templates/article.html --- a/themes/tuxlite_tbs/templates/article.html Sun Jan 03 00:53:23 2016 +0100 +++ b/themes/tuxlite_tbs/templates/article.html Sun Jan 03 00:54:02 2016 +0100 @@ -24,5 +24,7 @@ {% include "disqus.html" %} {% endif %} {% include "simple_comments.html" %} + {% include "pelican_comment_system.html" %} + {% include "add_comment.html" %} {% endblock %} diff -r ff642c382b2b -r 8de1cc117d89 themes/tuxlite_tbs/templates/pelican_comment_system.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/tuxlite_tbs/templates/pelican_comment_system.html Sun Jan 03 00:54:02 2016 +0100 @@ -0,0 +1,21 @@ +{% if article.comments %} + {% for comment in article.comments recursive %} + {% if loop.depth0 == 0 %} + {% set marginLeft = 0 %} + {% else %} + {% set marginLeft = 50 %} + {% endif %} +
+ Permalink +

{{ comment.author }}

+

Posted on {{ comment.locale_date }}

+ {{ comment.metadata['my_custom_metadata'] }} + {{ comment.content }} + {% if comment.replies %} + {{ loop(comment.replies) }} + {% endif %} +
+ {% endfor %} +{% else %} +

There are no comments yet.

+{% endif %} diff -r ff642c382b2b -r 8de1cc117d89 themes/tuxlite_tbs/templates/simple_comments.html --- a/themes/tuxlite_tbs/templates/simple_comments.html Sun Jan 03 00:53:23 2016 +0100 +++ b/themes/tuxlite_tbs/templates/simple_comments.html Sun Jan 03 00:54:02 2016 +0100 @@ -13,56 +13,3 @@ {% endfor %} {% endif %} -{% if article.metadata.allowcomments %} -

-
- Leave a comment -
-{% if False %} -
-{% endif %} - - - - - - - - - - - -{% if False %} - - - - - - - -{% endif %} - - - - -
- Your name: - - -
- Comment: - - -
- Please type the characters you see in this image: - -
- - - -
- -
-
-
-{% endif %}