use https

diff --git a/src/asciidoctorrss.props b/src/asciidoctorrss.props
index afba443..ee90a42 100644 (file)
--- a/src/asciidoctorrss.props
+++ b/src/asciidoctorrss.props
@@ -1,6 +1,6 @@
 feed.title=News
 feed.description=News of the wpitchoune.net website.
-feed.link=http://wpitchoune.net/news/feed.xml
-feed.baseurl=http://wpitchoune.net/news
+feed.link=https://wpitchoune.net/news/feed.xml
+feed.baseurl=https://wpitchoune.net/news
 
 html.header.file=src/header.html

diff --git a/www-update.sh b/www-update.sh
index 3edfc13..3a2d8ba 100755 (executable)
--- a/www-update.sh
+++ b/www-update.sh
@@ -25,6 +25,9 @@ cd git/asciidoctor_to_rss
 mvn clean install
 cd -
 
+echo Generate news files
+git/asciidoctor_to_rss/asciidoctor_to_rss.sh src/news www/news src/asciidoctorrss.props
+echo Generate news files done
 
 SDIR=`dirname $0`
 RDIR=`realpath $SDIR`
@@ -53,5 +56,3 @@ asciidoctor $OPTS src/ptask/ptask.adoc -D www/ptask/
 asciidoctor $OPTS src/cooking/riz_au_lait.adoc -D www/cooking/
 asciidoctor $OPTS src/cooking/index.adoc -D www/cooking/
 asciidoctor $OPTS src/cooking/semoule_au_lait.adoc -D www/cooking/
-
-git/asciidoctor_to_rss/asciidoctor_to_rss.sh src/news www/news src/asciidoctorrss.props

diff --git a/www/news/feed.xml b/www/news/feed.xml
index c84e42c..c935850 100644 (file)
--- a/www/news/feed.xml
+++ b/www/news/feed.xml
@@ -2,11 +2,53 @@
 <rss xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">\r
   <channel>\r
     <title>News</title>\r
-    <link>http://wpitchoune.net/news/feed.xml</link>\r
+    <link>https://wpitchoune.net/news/feed.xml</link>\r
     <description>News of the wpitchoune.net website.</description>\r
     <item>\r
+      <title>New website</title>\r
+      <link>https://wpitchoune.net/news/new_website.html</link>\r
+      <description>&lt;div class="paragraph"&gt;\r
+&lt;p&gt;After being bored with Wordpress for years, the &lt;a href="http://wpitchoune.net"&gt;wpitchoune.net&lt;/a&gt;\r
+website is changing. It is now based on &lt;a href="http://asciidoctor.org"&gt;Asciidoctor&lt;/a&gt; and\r
+a simple shell script to generate it.&lt;/p&gt;\r
+&lt;/div&gt;\r
+&lt;div class="paragraph"&gt;\r
+&lt;p&gt;With the help of &lt;a href="http://atom.io"&gt;Atom&lt;/a&gt; and a couple of addons dedicated to\r
+Asciidoctor, it is easy and quick to write content. I am happy to no\r
+more have to worry about the painful admistration of Wordpress,\r
+upgrading it, taking care of security, spamming of comments and bot\r
+account creation, and backup of databases.&lt;/p&gt;\r
+&lt;/div&gt;\r
+&lt;div class="paragraph"&gt;\r
+&lt;p&gt;If you want to know how the website is built, everything is on\r
+a GIT repository: &lt;a href="http://git.wpitchoune.net/gitweb/?p=www.git" class="bare"&gt;http://git.wpitchoune.net/gitweb/?p=www.git&lt;/a&gt;.\r
+It is simple, really simple&amp;#8230;&amp;#8203; but enough for my needs.&lt;/p&gt;\r
+&lt;/div&gt;</description>\r
+      <pubDate>Mon, 13 Jun 2016 22:00:00 GMT</pubDate>\r
+      <guid isPermaLink="false">https://wpitchoune.net/news/new_website.html</guid>\r
+      <dc:date>2016-06-13T22:00:00Z</dc:date>\r
+    </item>\r
+    <item>\r
+      <title>RSS Feed</title>\r
+      <link>https://wpitchoune.net/news/added_rss_feed.html</link>\r
+      <description>&lt;div class="paragraph"&gt;\r
+&lt;p&gt;It is now possible to follow news and announces of the\r
+website with the following RSS feed:\r
+&lt;a href="https://wpitchoune.net/news/feed.xml" class="bare"&gt;https://wpitchoune.net/news/feed.xml&lt;/a&gt;&lt;/p&gt;\r
+&lt;/div&gt;\r
+&lt;div class="paragraph"&gt;\r
+&lt;p&gt;Under the bridge it is automaticaly generated\r
+with a very simple program from Asciidoctor\r
+documents. You can get the sources\r
+from the GIT repository: &lt;a href="https://git.wpitchoune.net/asciidoctor_to_rss.git" class="bare"&gt;https://git.wpitchoune.net/asciidoctor_to_rss.git&lt;/a&gt; .&lt;/p&gt;\r
+&lt;/div&gt;</description>\r
+      <pubDate>Sun, 03 Jul 2016 22:00:00 GMT</pubDate>\r
+      <guid isPermaLink="false">https://wpitchoune.net/news/added_rss_feed.html</guid>\r
+      <dc:date>2016-07-03T22:00:00Z</dc:date>\r
+    </item>\r
+    <item>\r
       <title>Asciidoctor to RSS</title>\r
-      <link>http://wpitchoune.net/news/asciidoctor_to_rss.html</link>\r
+      <link>https://wpitchoune.net/news/asciidoctor_to_rss.html</link>\r
       <description>&lt;div id="preamble"&gt;\r
 &lt;div class="sectionbody"&gt;\r
 &lt;div class="paragraph"&gt;\r
@@ -121,12 +163,12 @@ The source document of this news is at &lt;a href="https://wpitchoune.net/gitweb
 &lt;/div&gt;\r
 &lt;/div&gt;</description>\r
       <pubDate>Sun, 10 Jul 2016 22:00:00 GMT</pubDate>\r
-      <guid isPermaLink="false">http://wpitchoune.net/news/asciidoctor_to_rss.html</guid>\r
+      <guid isPermaLink="false">https://wpitchoune.net/news/asciidoctor_to_rss.html</guid>\r
       <dc:date>2016-07-10T22:00:00Z</dc:date>\r
     </item>\r
     <item>\r
       <title>Call for contributions for the translation of psensor</title>\r
-      <link>http://wpitchoune.net/news/call_contribution.html</link>\r
+      <link>https://wpitchoune.net/news/call_contribution.html</link>\r
       <description>&lt;div class="paragraph"&gt;\r
 &lt;p&gt;The version 1.2.0 of psensor is going to be released in the coming\r
 weeks. This release will include many changes which impact the\r
@@ -135,49 +177,7 @@ it is now the good timeframe. See the
 &lt;a href="https://wpitchoune.net/psensor/contribute.html"&gt;instructions&lt;/a&gt;.&lt;/p&gt;\r
 &lt;/div&gt;</description>\r
       <pubDate>Mon, 13 Jun 2016 22:00:00 GMT</pubDate>\r
-      <guid isPermaLink="false">http://wpitchoune.net/news/call_contribution.html</guid>\r
-      <dc:date>2016-06-13T22:00:00Z</dc:date>\r
-    </item>\r
-    <item>\r
-      <title>RSS Feed</title>\r
-      <link>http://wpitchoune.net/news/added_rss_feed.html</link>\r
-      <description>&lt;div class="paragraph"&gt;\r
-&lt;p&gt;It is now possible to follow news and announces of the\r
-website with the following RSS feed:\r
-&lt;a href="https://wpitchoune.net/news/feed.xml" class="bare"&gt;https://wpitchoune.net/news/feed.xml&lt;/a&gt;&lt;/p&gt;\r
-&lt;/div&gt;\r
-&lt;div class="paragraph"&gt;\r
-&lt;p&gt;Under the bridge it is automaticaly generated\r
-with a very simple program from Asciidoctor\r
-documents. You can get the sources\r
-from the GIT repository: &lt;a href="https://git.wpitchoune.net/asciidoctor_to_rss.git" class="bare"&gt;https://git.wpitchoune.net/asciidoctor_to_rss.git&lt;/a&gt; .&lt;/p&gt;\r
-&lt;/div&gt;</description>\r
-      <pubDate>Sun, 03 Jul 2016 22:00:00 GMT</pubDate>\r
-      <guid isPermaLink="false">http://wpitchoune.net/news/added_rss_feed.html</guid>\r
-      <dc:date>2016-07-03T22:00:00Z</dc:date>\r
-    </item>\r
-    <item>\r
-      <title>New website</title>\r
-      <link>http://wpitchoune.net/news/new_website.html</link>\r
-      <description>&lt;div class="paragraph"&gt;\r
-&lt;p&gt;After being bored with Wordpress for years, the &lt;a href="http://wpitchoune.net"&gt;wpitchoune.net&lt;/a&gt;\r
-website is changing. It is now based on &lt;a href="http://asciidoctor.org"&gt;Asciidoctor&lt;/a&gt; and\r
-a simple shell script to generate it.&lt;/p&gt;\r
-&lt;/div&gt;\r
-&lt;div class="paragraph"&gt;\r
-&lt;p&gt;With the help of &lt;a href="http://atom.io"&gt;Atom&lt;/a&gt; and a couple of addons dedicated to\r
-Asciidoctor, it is easy and quick to write content. I am happy to no\r
-more have to worry about the painful admistration of Wordpress,\r
-upgrading it, taking care of security, spamming of comments and bot\r
-account creation, and backup of databases.&lt;/p&gt;\r
-&lt;/div&gt;\r
-&lt;div class="paragraph"&gt;\r
-&lt;p&gt;If you want to know how the website is built, everything is on\r
-a GIT repository: &lt;a href="http://git.wpitchoune.net/gitweb/?p=www.git" class="bare"&gt;http://git.wpitchoune.net/gitweb/?p=www.git&lt;/a&gt;.\r
-It is simple, really simple&amp;#8230;&amp;#8203; but enough for my needs.&lt;/p&gt;\r
-&lt;/div&gt;</description>\r
-      <pubDate>Mon, 13 Jun 2016 22:00:00 GMT</pubDate>\r
-      <guid isPermaLink="false">http://wpitchoune.net/news/new_website.html</guid>\r
+      <guid isPermaLink="false">https://wpitchoune.net/news/call_contribution.html</guid>\r
       <dc:date>2016-06-13T22:00:00Z</dc:date>\r
     </item>\r
   </channel>\r

diff --git a/www/news/news.html b/www/news/news.html
index da32c8e..f1eafa0 100644 (file)
--- a/www/news/news.html
+++ b/www/news/news.html
@@ -11,7 +11,7 @@
 <h1>News</h1>
 </div><div id='content'>
 
-<div><h2><a href='http://wpitchoune.net/news/asciidoctor_to_rss.html'>Asciidoctor to RSS</a></h2><div class='date'>2016-11-07</div><div id="preamble">
+<div><h2><a href='https://wpitchoune.net/news/asciidoctor_to_rss.html'>Asciidoctor to RSS</a></h2><div class='date'>2016-11-07</div><div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
 <p>In order to have a website based only on Asciidoctor
@@ -125,7 +125,7 @@ The source document of this news is at <a href="https://wpitchoune.net/gitweb/?p
 </div>
 </div></div>
 
-<div><h2><a href='http://wpitchoune.net/news/added_rss_feed.html'>RSS Feed</a></h2><div class='date'>2016-04-07</div><div class="paragraph">
+<div><h2><a href='https://wpitchoune.net/news/added_rss_feed.html'>RSS Feed</a></h2><div class='date'>2016-04-07</div><div class="paragraph">
 <p>It is now possible to follow news and announces of the
 website with the following RSS feed:
 <a href="https://wpitchoune.net/news/feed.xml" class="bare">https://wpitchoune.net/news/feed.xml</a></p>
@@ -137,15 +137,7 @@ documents. You can get the sources
 from the GIT repository: <a href="https://git.wpitchoune.net/asciidoctor_to_rss.git" class="bare">https://git.wpitchoune.net/asciidoctor_to_rss.git</a> .</p>
 </div></div>
 
-<div><h2><a href='http://wpitchoune.net/news/call_contribution.html'>Call for contributions for the translation of psensor</a></h2><div class='date'>2016-14-06</div><div class="paragraph">
-<p>The version 1.2.0 of psensor is going to be released in the coming
-weeks. This release will include many changes which impact the
-translations. If you want to contribute to the translation of psensor
-it is now the good timeframe. See the
-<a href="https://wpitchoune.net/psensor/contribute.html">instructions</a>.</p>
-</div></div>
-
-<div><h2><a href='http://wpitchoune.net/news/new_website.html'>New website</a></h2><div class='date'>2016-14-06</div><div class="paragraph">
+<div><h2><a href='https://wpitchoune.net/news/new_website.html'>New website</a></h2><div class='date'>2016-14-06</div><div class="paragraph">
 <p>After being bored with Wordpress for years, the <a href="http://wpitchoune.net">wpitchoune.net</a>
 website is changing. It is now based on <a href="http://asciidoctor.org">Asciidoctor</a> and
 a simple shell script to generate it.</p>
@@ -162,6 +154,14 @@ account creation, and backup of databases.</p>
 a GIT repository: <a href="http://git.wpitchoune.net/gitweb/?p=www.git" class="bare">http://git.wpitchoune.net/gitweb/?p=www.git</a>.
 It is simple, really simple&#8230;&#8203; but enough for my needs.</p>
 </div></div>
+
+<div><h2><a href='https://wpitchoune.net/news/call_contribution.html'>Call for contributions for the translation of psensor</a></h2><div class='date'>2016-14-06</div><div class="paragraph">
+<p>The version 1.2.0 of psensor is going to be released in the coming
+weeks. This release will include many changes which impact the
+translations. If you want to contribute to the translation of psensor
+it is now the good timeframe. See the
+<a href="https://wpitchoune.net/psensor/contribute.html">instructions</a>.</p>
+</div></div>
 </div>
 </body>
 </html>
\ No newline at end of file