gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[www] branch master updated (1de815a -> bf67a00)


From: gnunet
Subject: [www] branch master updated (1de815a -> bf67a00)
Date: Mon, 04 Nov 2019 13:18:06 +0100

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository www.

    from 1de815a  rssg: hack to sed in https://gnunet.org
     new 38f265e  fix up some news.
     new bf67a00  rssg title

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile                          |  2 +-
 news/2017-10.html.j2              |  2 +-
 news/2018-06.html.j2              |  3 +--
 news/2018-07.html.j2              |  4 +---
 news/2018-08.html.j2              |  2 +-
 news/2019-0.11.0.html.j2          |  2 +-
 news/2019-0.11.1.html.j2          |  2 +-
 news/2019-0.11.2.html.j2          |  2 +-
 news/2019-0.11.3.html.j2          |  2 +-
 news/2019-0.11.4.html.j2          |  2 +-
 news/2019-0.11.5.html.j2          |  2 +-
 news/2019-0.11.6.html.j2          |  2 +-
 news/2019-0.11.7.html.j2          |  2 +-
 news/2019-0.11.8.html.j2          |  2 +-
 news/2019-06-DSTJ.html.j2         |  2 +-
 news/2019-06.html.j2              |  2 +-
 news/2019-07-GHM_Aug_2019.html.j2 |  2 +-
 news/2019-10-GNSSpec1.html.j2     |  2 +-
 news/2019-10-ICANNPanel.html.j2   |  2 +-
 news/index.html.j2                | 20 +-------------------
 rssg                              |  6 +++++-
 template.py                       |  1 +
 22 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/Makefile b/Makefile
index bdd3697..2b1f793 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ all: css locale template
 .for _lang in ${_LOCALELIST}
        ($(cp) rendered/static/robots.txt rendered/${_lang})
        ($(cp) rendered/static/stage.robots.txt rendered/${_lang})
-       ($(cp) rss.xml rendered/${_lang})
+#      ($(cp) rss.xml rendered/${_lang})
 .endfor
 #.for _lang in ${_LOCALELIST}
 #      (cd rendered/${_lang}; $(ln) -fs ../dist dist)
diff --git a/news/2017-10.html.j2 b/news/2017-10.html.j2
index 104f42f..043b3aa 100644
--- a/news/2017-10.html.j2
+++ b/news/2017-10.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1>2017-10-01: Launching the new gnunet.org</h1>
+  <h1>Launching the new gnunet.org</h1>
 <p>
   Welcome to the redesign of gnunet.org, our website about GNUnet.
 </p>
diff --git a/news/2018-06.html.j2 b/news/2018-06.html.j2
index 35ba036..5c2e4cc 100644
--- a/news/2018-06.html.j2
+++ b/news/2018-06.html.j2
@@ -1,7 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <!-- 06/06/2018 -->
-  <h1><a name="gnunet-0.11.0pre66-release">GNUnet 0.11.0pre66</a></h1>
+  <h1>GNUnet 0.11.0pre66</h1>
 <p>
   Wed, 06/06/2018 - 07:20 - Christian Grothoff<br>
 </p>
diff --git a/news/2018-07.html.j2 b/news/2018-07.html.j2
index 9013d98..e8c14fe 100644
--- a/news/2018-07.html.j2
+++ b/news/2018-07.html.j2
@@ -1,8 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <a name="gnunet-hacker-meeting-2018-2"></a>
-  <h1>Second GNUnet Hacker Meeting 2018 at <a href="https://decentrale.ch/";>La 
D&#233;centrale</a>, Switzerland</h1>
-
+  <h1>Second GNUnet Hacker Meeting 2018 at La D&#233;centrale, Switzerland</h1>
   <p>
     The GNUnet hackers met for the second time this year. The primary goal was 
to squash bugs to bring out a new release. Aside from this we worked hard on 
improving the documentation and to launch this new website.
   </p>
diff --git a/news/2018-08.html.j2 b/news/2018-08.html.j2
index ea76183..3555c0f 100644
--- a/news/2018-08.html.j2
+++ b/news/2018-08.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1>2018-08: GSoC 2018 - GNUnet Web-based User Interface</h1>
+  <h1>GSoC 2018 - GNUnet Web-based User Interface</h1>
 <p>
   Tue, 08/14/2018 - 07:55 - Phil Buschmann 
 </p>
diff --git a/news/2019-0.11.0.html.j2 b/news/2019-0.11.0.html.j2
index 7f4d9e4..95f8324 100644
--- a/news/2019-0.11.0.html.j2
+++ b/news/2019-0.11.0.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-0.11.0-release">2019-02: GNUnet 0.11.0 released</a></h1>
+  <h1>GNUnet 0.11.0 released</h1>
   <p>
     We are pleased to announce the release of GNUnet 0.11.0.
   </p>
diff --git a/news/2019-0.11.1.html.j2 b/news/2019-0.11.1.html.j2
index b4b72c2..c7a9adc 100644
--- a/news/2019-0.11.1.html.j2
+++ b/news/2019-0.11.1.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-0.11.1-release">2019-04-03: GNUnet 0.11.1 
released</a></h1>
+  <h1>GNUnet 0.11.1 released</h1>
 <p>
   We are pleased to announce the release of GNUnet 0.11.1.
 </p>
diff --git a/news/2019-0.11.2.html.j2 b/news/2019-0.11.2.html.j2
index 20e249c..7ce3349 100644
--- a/news/2019-0.11.2.html.j2
+++ b/news/2019-0.11.2.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-0.11.2-release">2019-04-04: GNUnet 0.11.2 
released</a></h1>
+  <h1>GNUnet 0.11.2 released</h1>
 <p>
   We are pleased to announce the release of GNUnet 0.11.2.
 </p>
diff --git a/news/2019-0.11.3.html.j2 b/news/2019-0.11.3.html.j2
index 62fd5e8..3d655cb 100644
--- a/news/2019-0.11.3.html.j2
+++ b/news/2019-0.11.3.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-0.11.3-release">2019-04-07: GNUnet 0.11.3 
released</a></h1>
+  <h1>GNUnet 0.11.3 released</h1>
 <p>
   We are pleased to announce the release of GNUnet 0.11.3.
 </p>
diff --git a/news/2019-0.11.4.html.j2 b/news/2019-0.11.4.html.j2
index 3960e60..0fbc0c2 100644
--- a/news/2019-0.11.4.html.j2
+++ b/news/2019-0.11.4.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-0.11.4-release">2019-05-12: GNUnet 0.11.4 
released</a></h1>
+  <h1>GNUnet 0.11.4 released</h1>
 <p>
   We are pleased to announce the release of GNUnet 0.11.4.
 </p>
diff --git a/news/2019-0.11.5.html.j2 b/news/2019-0.11.5.html.j2
index d41f372..28845d5 100644
--- a/news/2019-0.11.5.html.j2
+++ b/news/2019-0.11.5.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-0.11.5-release">2019-06-05: GNUnet 0.11.5 
released</a></h1>
+  <h1>GNUnet 0.11.5 released</h1>
 <p>
   We are pleased to announce the release of GNUnet 0.11.5.
 </p>
diff --git a/news/2019-0.11.6.html.j2 b/news/2019-0.11.6.html.j2
index c00cd31..fefbb28 100644
--- a/news/2019-0.11.6.html.j2
+++ b/news/2019-0.11.6.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-0.11.6-release">2019-07-24: GNUnet 0.11.6 
released</a></h1>
+  <h1>GNUnet 0.11.6 released</h1>
 <p>
   We are pleased to announce the release of GNUnet 0.11.6.
 </p>
diff --git a/news/2019-0.11.7.html.j2 b/news/2019-0.11.7.html.j2
index 308ff42..37184d4 100644
--- a/news/2019-0.11.7.html.j2
+++ b/news/2019-0.11.7.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-0.11.7-release">2019-10-27: GNUnet 0.11.7 
released</a></h1>
+  <h1>GNUnet 0.11.7 released</h1>
 <p>
   We are pleased to announce the release of GNUnet 0.11.7.
 </p>
diff --git a/news/2019-0.11.8.html.j2 b/news/2019-0.11.8.html.j2
index 370fa09..59cbffe 100644
--- a/news/2019-0.11.8.html.j2
+++ b/news/2019-0.11.8.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-0.11.8-release" title="0.11.8">2019-10-30: GNUnet 0.11.8 
released</a></h1>
+  <h1>GNUnet 0.11.8 released</h1>
 <p>
   We are pleased to announce the release of GNUnet 0.11.8.
 </p>
diff --git a/news/2019-06-DSTJ.html.j2 b/news/2019-06-DSTJ.html.j2
index b88ab74..dc124d7 100644
--- a/news/2019-06-DSTJ.html.j2
+++ b/news/2019-06-DSTJ.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="DSTJ">2019-06-28: Peer DSTJ is dead, long live peer 
Y924</a></h1>
+  <h1>Peer DSTJ is dead, long live peer Y924</h1>
 <p>
   After some issues with our infrastructure we needed to replace our 
bootstrapping peer. To avoid problems when connecting to GNUnet the operator of 
a peer needs to update its node by removing the peer ID 
<tt>DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0</tt> from the system. 
Here are two strategies to find copies of the respective file:
 </p>
diff --git a/news/2019-06.html.j2 b/news/2019-06.html.j2
index 1e549cb..295138b 100644
--- a/news/2019-06.html.j2
+++ b/news/2019-06.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1>2019-06-28: GNUnet Hacker Meeting 2019 at <a 
href="https://decentrale.ch";>La D&#233;centrale, Switzerland</a></h1>
+  <h1>GNUnet Hacker Meeting 2019 at La D&#233;centrale, Switzerland</h1>
   <p>
     The members of the GNUnet community met again in the wonderful 
souroundings of St. Imier to hack on GNUnet. New people joined our sessions 
until late at night. From bug squashing to digging our own dog food, from 
workshops to theoretical discussions of new services and usecases. And of 
course, pizza was in the game. 
   </p>
diff --git a/news/2019-07-GHM_Aug_2019.html.j2 
b/news/2019-07-GHM_Aug_2019.html.j2
index d9c72fc..c846432 100644
--- a/news/2019-07-GHM_Aug_2019.html.j2
+++ b/news/2019-07-GHM_Aug_2019.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1>2019-07-17: GNUnet Hacker Meeting in August 2019 at <a 
href="https://";>Wernsdort (near Berlin)</a></h1>
+  <h1>GNUnet Hacker Meeting in August 2019 at Wernsdort (near Berlin)</h1>
   <p>
     In August 2019, some of us met in Wernsdorf for focused work on GNUnet.
   </p>
diff --git a/news/2019-10-GNSSpec1.html.j2 b/news/2019-10-GNSSpec1.html.j2
index 5b79546..3941c16 100644
--- a/news/2019-10-GNSSpec1.html.j2
+++ b/news/2019-10-GNSSpec1.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-lsd001-p1">2019-10-04: GNS Technical Specification 
Milestone 1/4</a></h1>
+  <h1>GNS Technical Specification Milestone 1/4</h1>
 <p>
   We are happy to announce the completion of the first milestone for the GNS 
Specification. The objective is to provide a detailed and comprehensive guide 
for implementors of the GNU Name System. The initial milestone consists of 
documenting the cryptographic principles of GNS data structures. This includes 
the specification of the GNS record wire and serialization formats as well as 
internationalization.<br>
   <i>NOTE: The currently specified protocol is planned to be implemented for 
GNUnet 0.12. The current GNS implementation (0.11) exhibits minor but 
compatibility breaking deviations from this specification.</i> The draft 
specification <b>LSD001</b> can be found at:
diff --git a/news/2019-10-ICANNPanel.html.j2 b/news/2019-10-ICANNPanel.html.j2
index 41205f9..08885fa 100644
--- a/news/2019-10-ICANNPanel.html.j2
+++ b/news/2019-10-ICANNPanel.html.j2
@@ -1,6 +1,6 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-  <h1><a name="gnunet-icann-gns">2019-10-20: GNUnet project invited to 
ICANN66</a></h1>
+  <h1>GNUnet project invited to ICANN66</h1>
 <p>
   We are delighted to announce that ICANN has invited the GNUnet project to 
speak at the <a href="https://meetings.icann.org/en/montreal66";>next ICANN 
Annual General Meeting</a>. We have been invited to join a panel discussion on 
<i>Emerging Internet Identifier Technologies</i> in order to share our ideas 
and work on the <i>GNU Name System (GNS)</i>. ICANN generously offered to cover 
travel and accomodation.
 </p>
diff --git a/news/index.html.j2 b/news/index.html.j2
index df34051..0d4cac4 100644
--- a/news/index.html.j2
+++ b/news/index.html.j2
@@ -12,29 +12,11 @@
           News posts published by GNUnet about changes related to
           GNUnet, releases, and events.
         </p>
-        <!-- TODO: This list should be generated -->
         <ul>
           {% for item in newsdata %}
-            <li><a href='{{ item["page"] }}' title='{{ item["date"]}}'>{{ 
item["title"] }}</a></li>
+            <li><a href="{{ item['page'] }}" title="{{ item['date']}}">{{ 
item['title'] }}</a></li>
           {% endfor %}
         </ul>
-        <!--
-          <li><a href="2019-0.11.8.html" title="2019-10-30">GNUnet 
0.11.8</a></li>
-        <li><a href="2019-0.11.7.html" title="2019-10-27">GNUnet 
0.11.7</a></li>
-        <li><a href="2019-10-ICANNPanel.html" title="2019-10-20">ICANN 
Panel</a></li>
-        <li><a href="2019-10-GNSSpec1.html" title="2019-10-04">GNS Spec 
1</a></li>
-        <li><a href="2019-0.11.6.html" title="2019-07-24">GNUnet 
0.11.6</a></li>
-        <li><a href="2019-07-GHM_Aug_2019.html" title="2019-07-17">GNUnet 
Hacker Meeting 2019</a></li>
-        <li><a href="2019-06-DSTJ.html" title="2019-06-28">DSTJ</a></li>
-        <li><a href="2019-06.html" title="2019-06-01">2019-06</a></li>
-        <li><a href="2019-0.11.5.html" title="2019-06-05">GNUnet 
0.11.5</a></li>
-        <li><a href="2019-0.11.4.html" title="2019-05-12">GNUnet 
0.11.4</a></li>
-        <li><a href="2019-0.11.3.html" title="2019-04-07">GNUnet 
0.11.3</a></li>
-        <li><a href="2019-0.11.2.html" title="2019-04-04">GNUnet 
0.11.2</a></li>
-        <li><a href="2019-0.11.1.html" title="2019-04-03">GNUnet 
0.11.1</a></li>
-        <li><a href="2019-0.11.0.html" title="2019-02-28">GNUnet 
0.11.0</a></li>
-        <li><a href="2019-02.html" title="2019-02-01">2019-02</a></li>
-        -->
       </section>
     </article>
   </div>
diff --git a/rssg b/rssg
index 09e370c..fbb97d4 100755
--- a/rssg
+++ b/rssg
@@ -19,6 +19,9 @@
 set -e
 
 # TODO: Fix date -j for GNU date.
+# TODO: Fix base url (get_url)
+# TODO: Fix link OR a in get_url
+# TODO: get_title: be more dynamic about where the title can be.
 
 main () {
        test -n "$1" || usage
@@ -76,7 +79,8 @@ md_to_html() {
 
 
 get_title() {
-       awk 'tolower($0)~/^<h1/{gsub(/<[^>]*>/,"",$0);print;exit}'
+        awk -F '[<>]' '/<h1/ { gsub(/<h1>/, ""); gsub(/<\/h1>/, ""); sub(/ 
.*/, "", $3); print $0}' | sed 's/^[ \t]*//;s/[ \t]*$//' | awk 'FNR==2'
+       # awk 'tolower($0)~/^<h1/{gsub(/<[^>]*>/,"",$0);print;exit}'
 }
 
 
diff --git a/template.py b/template.py
index a5b3119..27c143e 100755
--- a/template.py
+++ b/template.py
@@ -211,6 +211,7 @@ newsposts = [
     {'page': '2019-0.11.1.html', 'date': '2019-04-03', 'title': 'GNUnet 
0.11.1'},
     {'page': '2019-0.11.0.html', 'date': '2019-02-28', 'title': 'GNUnet 
0.11.0'},
     {'page': '2019-02.html', 'date': '2019-02-01', 'title': 'Google Summer of 
Code 2019'},
+    {'page': '2017-10.html', 'date': '2017-10-01', 'title': 'Launching the new 
gnunet.org'},
 ]
 
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]