From: Jean-Philippe Orsini Date: Sat, 27 May 2017 16:19:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://wpitchoune.net/srv/git/www X-Git-Url: https://wpitchoune.net/gitweb/?p=www.git;a=commitdiff_plain;h=30d3073487892c62872bfc407c18cedb2247b875;hp=6fff7902fa472ba93dda3c69455ce74b35d04fda Merge branch 'master' of ssh://wpitchoune.net/srv/git/www --- diff --git a/src/news/psensor_v1_2_0.adoc b/src/news/psensor_v1_2_0.adoc new file mode 100644 index 0000000..a42a85d --- /dev/null +++ b/src/news/psensor_v1_2_0.adoc @@ -0,0 +1,13 @@ += Psensor v1.2.0 +Jean-Philippe Orsini +:docinfo2: +:date: 2017-04-02 +:icons: font + +Psensor v1.2.0 has been released. + +The source can be download at: +https://wpitchoune.net/psensor/files + +The news can be read at: +https://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=NEWS.html diff --git a/src/psensor/build_debian_pkg.adoc b/src/psensor/build_debian_pkg.adoc new file mode 100644 index 0000000..795b059 --- /dev/null +++ b/src/psensor/build_debian_pkg.adoc @@ -0,0 +1,81 @@ += How to build the Debian package of `psensor` from GIT +:docinfo2: +:icons: font + +This document is explaining step by step how to build the Debian +package of psensor directly from the GIT repository. + +== Build the Debian package + +Install `git-buildpackage`: + +---- +sudo apt-get install git-buildpackage +---- + +Install all build dependencies (you can get it from +the variable `Build-depends` of the file `debian/control`): + +---- +sudo apt-get install ... +---- + +Checkout the source of `psensor` and its packaging: + +---- +git clone https://git.wpitchoune.net/psensor-pkg-debian.git +---- + +Build the Debian package: + +---- +cd psensor-pkg-debian.git +git-buildpackage +---- + +== Build to another Debian distribution + +`pbuilder` can be used to build `psensor` to another Debian +distribution than the one used by the build machine. + +Installation of `pbuilder`: + +---- +apt-get install pbuilder qemu-user-static +---- + +Create the distribution image: + +---- +git-pbuilder create --config raspbian.pbuilderrc +---- + +The variable `DISTRIBUTION` in the configuration file is specifying +the distribution target of the build. It might be useful for +example to check the compilation on the 'testing' flavor of `Debian`. + +See a configuration example for `Raspbian`: +link:raspbian.pbuilderrc[raspbian]. + +To update the image: + +---- +git-pbuilder update +---- + +Checkout the source of `psensor` and its packaging: + +---- +git clone https://git.wpitchoune.net/psensor-pkg-debian.git +---- + +And finally, build the `Debian` package: + +---- +git-buildpackage --git-pbuilder +---- + +== References + +* https://wiki.debian.org/git-pbuilder +* https://www.debian.org/doc/manuals/maint-guide/build.en.html \ No newline at end of file diff --git a/src/psensor/index.adoc b/src/psensor/index.adoc index 8dc0ec0..dac6356 100644 --- a/src/psensor/index.adoc +++ b/src/psensor/index.adoc @@ -106,6 +106,7 @@ Binary packages of `psensor` are available for few Linux distributions: * link:ubuntu.html[Psensor on Ubuntu] * link:remote.html[Remote monitoring] * link:contribute.html[How to contribute to psensor] +* link:build_debian_pkg.html[How to build the debian package of psensor] * link:faq.html[FAQ] == Contact diff --git a/src/psensor/raspbian.pbuilderrc b/src/psensor/raspbian.pbuilderrc new file mode 100644 index 0000000..d926a37 --- /dev/null +++ b/src/psensor/raspbian.pbuilderrc @@ -0,0 +1,18 @@ +# pbuilderrc file for raspbian + +# specific to raspbian +OS=raspbian +ARCHITECTURE=armhf +# use the correct keyring for raspbian +DEBOOTSTRAPOPTS=( '--variant=buildd' '--keyring=/usr/share/keyrings/raspbian-archive-keyring.gpg') +MIRRORSITE=http://archive.raspbian.org/raspbian/ + +# debian distribution: sid, jessie, testing +DISTRIBUTION=testing + +COMPONENTS="main" + +DEBOOTSTRAP=qemu-debootstrap + +# allow network so pbuilder can install build dependencies automaticaly +USENETWORK=yes \ No newline at end of file diff --git a/src/tricks/index.adoc b/src/tricks/index.adoc index 17bed70..cb645e3 100644 --- a/src/tricks/index.adoc +++ b/src/tricks/index.adoc @@ -6,6 +6,11 @@ * link:raspberry_pi3_increase_swap_size.html[Increase swap size] * link:raspberry_pi3_temperature.html[How to get the temperature of the Raspberry PI3] +* link:raspberry_pi3_configure_timezone.html[How to configure the timezone of the Raspberry PI3] +* link:raspberry_pi3_overclock.html[Overclocking of the Raspberry PI3] +* link:raspberry_pi3_change_windows_manager.html[Change the windows manager of the Raspberry PI3] +* link:raspberry_pi3_configure_wifi.html[Configure the Wifi] +* link:raspberry_pi3_sound.html[Configure sound] == https://letsencrypt.org[Let's Encrypt] diff --git a/src/tricks/raspberry_pi3_change_windows_manager.adoc b/src/tricks/raspberry_pi3_change_windows_manager.adoc new file mode 100644 index 0000000..9327b90 --- /dev/null +++ b/src/tricks/raspberry_pi3_change_windows_manager.adoc @@ -0,0 +1,6 @@ += Raspberry PI - Change windows manager +:docinfo2: +:icons: font + + +sudo update-alternatives --config x-session-manager \ No newline at end of file diff --git a/src/tricks/raspberry_pi3_configure_timezone.adoc b/src/tricks/raspberry_pi3_configure_timezone.adoc new file mode 100644 index 0000000..f4a3857 --- /dev/null +++ b/src/tricks/raspberry_pi3_configure_timezone.adoc @@ -0,0 +1,10 @@ += Raspberry PI - configure the timezone +:docinfo2: +:icons: font + +Configure the timezone of the Raspberry: +---- +sudo dpkg-reconfigure tzdata +---- + +then reply to the questions. diff --git a/src/tricks/raspberry_pi3_configure_wifi.adoc b/src/tricks/raspberry_pi3_configure_wifi.adoc new file mode 100644 index 0000000..f8d485a --- /dev/null +++ b/src/tricks/raspberry_pi3_configure_wifi.adoc @@ -0,0 +1,47 @@ += Raspberry PI - Configure the Wifi +:docinfo2: +:icons: font + +For WPA Wifi, edit the file `/etc/wpa_supplicant/wpa_supplicant.conf` +as root. + +Example: + +``` +ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev +update_config=1 +country=FR + +network={ + ssid="MY_SSID" + psk="MY_PASSWORD" + key_mgmt=WPA-PSK +} +``` + +Replace `MY_SSID` by the name of the Wifi network and `MY_PASSWORD` +by the password of the Wifi network. + +Multiple networks can be declared, the one with higher priority will +be used if possible: + +``` +ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev +update_config=1 +country=FR + +network={ + ssid="MY_SSID" + psk="MY_PASSWORD" + key_mgmt=WPA-PSK + priority=2 +} + +network={ + ssid="MY_SSID2" + psk="MY_PASSWORD2" + key_mgmt=WPA-PSK + priority=1 +} + +``` diff --git a/src/tricks/raspberry_pi3_increase_swap_size.adoc b/src/tricks/raspberry_pi3_increase_swap_size.adoc index aa542aa..dea4d01 100644 --- a/src/tricks/raspberry_pi3_increase_swap_size.adoc +++ b/src/tricks/raspberry_pi3_increase_swap_size.adoc @@ -5,20 +5,23 @@ == Stop the swap ---- -dphys-swapfile swapoff +sudo dphys-swapfile swapoff ---- == Modify the size of the swap As `root`, edit the file `/etc/dphys-swapfile` and modify -the variable `dphys-swapfile`: +the variable `CONF_SWAPSIZE`: ---- CONF_SWAPSIZE=1024 ---- +To modify the swap file, edit the variable `CONF_SWAPFILE`, and run +`dphys-swapfile setup` which will create and initialize the file. + == Start the swap ---- -dphys-swapfile swapon +sudo dphys-swapfile swapon ---- \ No newline at end of file diff --git a/src/tricks/raspberry_pi3_overclock.adoc b/src/tricks/raspberry_pi3_overclock.adoc new file mode 100644 index 0000000..56c6cd7 --- /dev/null +++ b/src/tricks/raspberry_pi3_overclock.adoc @@ -0,0 +1,7 @@ += Raspberry PI - Overclocking +:docinfo2: +:icons: font + +== Reference + +http://www.jackenhack.com/raspberry-pi-3-overclocking/ \ No newline at end of file diff --git a/src/tricks/raspberry_pi3_sound.adoc b/src/tricks/raspberry_pi3_sound.adoc new file mode 100644 index 0000000..85ac504 --- /dev/null +++ b/src/tricks/raspberry_pi3_sound.adoc @@ -0,0 +1,21 @@ += Raspberry PI - Configure the sound +:docinfo2: +:icons: font + +== Output to the headphones + +By default it appears that the default output of the sound +is automatic, it means that if HDMI supports audio it will +use it. + +To change the audio output: + +---- +sudo amixer -c 0 cset numid=3 +---- + +where can be: + +* 0: auto +* 1: headphones +* 2: hdmi \ No newline at end of file diff --git a/src/tricks/scan.sh b/src/tricks/scan.sh new file mode 100755 index 0000000..e60a84c --- /dev/null +++ b/src/tricks/scan.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +set -e + +if [ -z "$1" ] +then + FILE_BASE="file" +else + FILE_BASE="$1" +fi + +STR_DATE=`date +"%Y_%m_%d"` +TIFF_FILE="$FILE_BASE"_"$STR_DATE.tiff" +PNG_FILE="$FILE_BASE"_"$STR_DATE.png" + +echo "Scan to temporary file: $TIFF_FILE" + +scanimage > $TIFF_FILE + +convert $TIFF_FILE $PNG_FILE + +echo "Converted to $PNG_FILE" + +rm $TIFF_FILE diff --git a/www-update.sh b/www-update.sh index fed5d14..a067f27 100755 --- a/www-update.sh +++ b/www-update.sh @@ -56,6 +56,8 @@ asciidoctor $OPTS src/psensor/index.adoc -D www/psensor/ asciidoctor $OPTS src/psensor/ubuntu.adoc -D www/psensor/ asciidoctor $OPTS src/psensor/remote.adoc -D www/psensor asciidoctor $OPTS src/psensor/contribute.adoc -D www/psensor/ +asciidoctor $OPTS src/psensor/build_debian_pkg.adoc -D www/psensor/ +cp src/psensor/raspbian.pbuilderrc www/psensor OPTS="-a linkcss -a stylesheet=../style.css" diff --git a/www/cooking/index.html b/www/cooking/index.html index 937dc37..9dd99ed 100644 --- a/www/cooking/index.html +++ b/www/cooking/index.html @@ -1,12 +1,13 @@ - - + + + Recettes de cuisine - + @@ -15,8 +16,6 @@

Recettes de cuisine

-
-
  • @@ -34,11 +33,9 @@
-
-
diff --git a/www/cooking/nems_au_poulet.html b/www/cooking/nems_au_poulet.html index 4ce0636..80e34ad 100644 --- a/www/cooking/nems_au_poulet.html +++ b/www/cooking/nems_au_poulet.html @@ -52,7 +52,7 @@ diff --git a/www/cooking/riz_au_lait.html b/www/cooking/riz_au_lait.html index 2a2fd89..9811e8a 100644 --- a/www/cooking/riz_au_lait.html +++ b/www/cooking/riz_au_lait.html @@ -70,7 +70,7 @@ diff --git a/www/cooking/semoule_au_lait.html b/www/cooking/semoule_au_lait.html index 3da9425..78d1dc0 100644 --- a/www/cooking/semoule_au_lait.html +++ b/www/cooking/semoule_au_lait.html @@ -83,7 +83,7 @@ et 12cl de crème liquide

diff --git a/www/cooking/soupe_choux_vert.html b/www/cooking/soupe_choux_vert.html index 58327de..683a86d 100644 --- a/www/cooking/soupe_choux_vert.html +++ b/www/cooking/soupe_choux_vert.html @@ -1,12 +1,13 @@ - - + + + Soupe au choux vert - + @@ -16,7 +17,7 @@
-

Ingrédients

+

Ingrédients

    @@ -48,7 +49,7 @@
diff --git a/www/mp3tool/mp3tool.html b/www/mp3tool/mp3tool.html index 9fa64de..d04c49a 100644 --- a/www/mp3tool/mp3tool.html +++ b/www/mp3tool/mp3tool.html @@ -172,7 +172,7 @@ binary packages, see the ‘Download Links’ section of this page.

diff --git a/www/news/feed.xml b/www/news/feed.xml index e0216a6..3978a08 100644 --- a/www/news/feed.xml +++ b/www/news/feed.xml @@ -5,6 +5,80 @@ https://wpitchoune.net/news/feed.xml News of the wpitchoune.net website. + New website + https://wpitchoune.net/news/new_website.html + <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> +</div> +<div class="paragraph"> +<p>With the help of <a href="http://atom.io">Atom</a> and a couple of addons dedicated to +Asciidoctor, it is easy and quick to write content. I am happy to no +more have to worry about the painful admistration of Wordpress, +upgrading it, taking care of security, spamming of comments and bot +account creation, and backup of databases.</p> +</div> +<div class="paragraph"> +<p>If you want to know how the website is built, everything is on +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> + Mon, 13 Jun 2016 22:00:00 GMT + https://wpitchoune.net/news/new_website.html + 2016-06-13T22:00:00Z + + + Psensor v1.2.0 + https://wpitchoune.net/news/psensor_v1_2_0.html + <div class="paragraph"> +<p>Psensor v1.2.0 has been released.</p> +</div> +<div class="paragraph"> +<p>The source can be download at: +<a href="https://wpitchoune.net/psensor/files" class="bare">https://wpitchoune.net/psensor/files</a></p> +</div> +<div class="paragraph"> +<p>The news can be read at: +<a href="https://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=NEWS.html" class="bare">https://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=NEWS.html</a></p> +</div> + Fri, 03 Feb 2017 23:00:00 GMT + https://wpitchoune.net/news/psensor_v1_2_0.html + 2017-02-03T23:00:00Z + + + Call for contributions for the translation of psensor + https://wpitchoune.net/news/call_contribution.html + <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> + Mon, 13 Jun 2016 22:00:00 GMT + https://wpitchoune.net/news/call_contribution.html + 2016-06-13T22:00:00Z + + + RSS Feed + https://wpitchoune.net/news/added_rss_feed.html + <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> +</div> +<div class="paragraph"> +<p>Under the bridge it is automaticaly generated +with a very simple program from Asciidoctor +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> + Sun, 03 Jul 2016 22:00:00 GMT + https://wpitchoune.net/news/added_rss_feed.html + 2016-07-03T22:00:00Z + + Asciidoctor to RSS https://wpitchoune.net/news/asciidoctor_to_rss.html <div id="preamble"> @@ -185,61 +259,5 @@ compatible with RSS v2.0.</p> https://wpitchoune.net/news/asciidoctor_to_rss.html 2016-07-10T22:00:00Z - - Call for contributions for the translation of psensor - https://wpitchoune.net/news/call_contribution.html - <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> - Mon, 13 Jun 2016 22:00:00 GMT - https://wpitchoune.net/news/call_contribution.html - 2016-06-13T22:00:00Z - - - RSS Feed - https://wpitchoune.net/news/added_rss_feed.html - <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> -</div> -<div class="paragraph"> -<p>Under the bridge it is automaticaly generated -with a very simple program from Asciidoctor -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> - Sun, 03 Jul 2016 22:00:00 GMT - https://wpitchoune.net/news/added_rss_feed.html - 2016-07-03T22:00:00Z - - - New website - https://wpitchoune.net/news/new_website.html - <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> -</div> -<div class="paragraph"> -<p>With the help of <a href="http://atom.io">Atom</a> and a couple of addons dedicated to -Asciidoctor, it is easy and quick to write content. I am happy to no -more have to worry about the painful admistration of Wordpress, -upgrading it, taking care of security, spamming of comments and bot -account creation, and backup of databases.</p> -</div> -<div class="paragraph"> -<p>If you want to know how the website is built, everything is on -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> - Mon, 13 Jun 2016 22:00:00 GMT - https://wpitchoune.net/news/new_website.html - 2016-06-13T22:00:00Z - diff --git a/www/news/news.html b/www/news/news.html index 2f62719..6e345db 100644 --- a/www/news/news.html +++ b/www/news/news.html @@ -13,6 +13,22 @@
+
-
+
+
+

Call for contributions for the translation of psensor

+
2016-14-06
+
+
+

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 +instructions.

+