# HG changeset patch # User Dirk Olmes # Date 1451735989 -3600 # Node ID f6690e50793c26a65015066ff0f8a25cd8530a83 # Parent c2b99e876559903cbc761ed73aeec65ca69bdec0# Parent 7ad57342534a4b1803cbfc9c7bb2c03dbd05f573 merge with default diff -r 7ad57342534a -r f6690e50793c 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 Sat Jan 02 12:59:49 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 7ad57342534a -r f6690e50793c 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 Sat Jan 02 12:59:49 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 7ad57342534a -r f6690e50793c 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 Sat Jan 02 12:59:49 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 7ad57342534a -r f6690e50793c 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 Wed Dec 30 12:23:35 2015 +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 7ad57342534a -r f6690e50793c 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 Wed Dec 30 12:23:35 2015 +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 7ad57342534a -r f6690e50793c 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 Wed Dec 30 12:23:35 2015 +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 7ad57342534a -r f6690e50793c 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 Sat Jan 02 12:59:49 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 7ad57342534a -r f6690e50793c content/comments/fair-traffic-queueing-using-fq_codel/1 --- a/content/comments/fair-traffic-queueing-using-fq_codel/1 Wed Dec 30 12:23:35 2015 +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 7ad57342534a -r f6690e50793c content/pages/about.md --- a/content/pages/about.md Wed Dec 30 12:23:35 2015 +0100 +++ b/content/pages/about.md Sat Jan 02 12:59:49 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 7ad57342534a -r f6690e50793c pelicanconf.py --- a/pelicanconf.py Wed Dec 30 12:23:35 2015 +0100 +++ b/pelicanconf.py Sat Jan 02 12:59:49 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 7ad57342534a -r f6690e50793c 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 Sat Jan 02 12:59:49 2016 +0100 @@ -0,0 +1,35 @@ +
+
+ Leave a comment +
+{% if False %} +
+{% endif %} + + + + + + + + + + + + + + + +
+ Your name: + + +
+ Comment: + + +
+ +
+
+
diff -r 7ad57342534a -r f6690e50793c themes/tuxlite_tbs/templates/article.html --- a/themes/tuxlite_tbs/templates/article.html Wed Dec 30 12:23:35 2015 +0100 +++ b/themes/tuxlite_tbs/templates/article.html Sat Jan 02 12:59:49 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 7ad57342534a -r f6690e50793c 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 Sat Jan 02 12:59:49 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 7ad57342534a -r f6690e50793c themes/tuxlite_tbs/templates/simple_comments.html --- a/themes/tuxlite_tbs/templates/simple_comments.html Wed Dec 30 12:23:35 2015 +0100 +++ b/themes/tuxlite_tbs/templates/simple_comments.html Sat Jan 02 12:59:49 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 %}