Recent changes to this wiki:

Foulab's finally up now.
diff --git a/nodes/foulab.mdwn b/nodes/foulab.mdwn
index 30765537..99686c93 100644
--- a/nodes/foulab.mdwn
+++ b/nodes/foulab.mdwn
@@ -1,6 +1,6 @@
 [[!waypoint lat="45.47933" lon="-73.58979" embed hidden width="400px" height="400px" right desc="Out of a 3rd-story window, with a view towards the hospital"]]
 
-A window in [[Foulab|http://foulab.org/]] looking down along St Antoine.
+A window in [[Foulab|http://foulab.org/]] with a view along de Richelieu, directed towards the hospital.
 
  * MAC address: F0:0F:BA:5E:13:37
  * IP address: 172.16.0.25
@@ -9,11 +9,11 @@ A window in [[Foulab|http://foulab.org/]] looking down along St Antoine.
  * Hardware: COMFAST CF-E110N
  * Power:
  * Location:
- * Status: [[!taglink planned]]
+ * Status: [[!taglink up]]
  * Links: 
  * Azimuth:
  * Panorama:
- * Operators: [[users/xsmurf]],[[users/kryma]]
+ * Operators: [[users/kryma]]
 
 [[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
 

diff --git a/nodes/elecnix.mdwn b/nodes/elecnix.mdwn
index 7cd50795..5c903733 100644
--- a/nodes/elecnix.mdwn
+++ b/nodes/elecnix.mdwn
@@ -4,11 +4,6 @@ Ce noeud est installé sur le côté de la maison, au bout d'un petit mât qui n
 
 Il y a aussi un NanoStation M5 (5 GHz, WDS Access Point, WPA2-AES PSK, and no Babel yet, MAC 00:15:6D:3C:01:B9) vers le nord nord géographique, mais qui ne roule pas Babel pour l'instant.
 
-# Services
-
- * [[Discourse|http://10.72.91.50:82]]
- * [[OwnCloud|http://10.72.91.64/owncloud/]]
-
 # Technical details
 
 [[!ymlfront data="""
@@ -57,18 +52,10 @@ Status
 : [[!taglink down]]
 
 Operator
-: [[mailto:nicolas@marchildon.net]] ([[/users/elecnix]]) [[FB|https://www.facebook.com/elecnix]] [[G+|https://plus.google.com/+NicolasMarchildon]]
-
-Links
-: [[/nodes/besik]] ([[links/elecnix-besik/]])
-
-Backup power
-: Short-term: 30 minutes (UPS), Emergency: car battery. I plan to increase capacity to 2 full days.
+: [[/users/elecnix]]
 
 [[Configuration|/nodes/elecnix/config]]
 
-[[!img elecnix1.jpg align="right" size="900x" alt="Photo"]]
-
 [[!meta copyright="Copyright © 2012-2013 Nicolas Marchildon"]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable

diff --git a/users/elecnix.mdwn b/users/elecnix.mdwn
index 38bfc4e6..0ab78b00 100644
--- a/users/elecnix.mdwn
+++ b/users/elecnix.mdwn
@@ -1,10 +1,6 @@
 # Nicolas Marchildon
-[[!img nicolas_300.jpg align="right" size="150x"]]
-Je suis programmeur. J'ai installé une antenne chez moi, avant la naissance du projet, pour envoyer des backups chez mon frère. J'ai installé OpenWrt sur le petit routeur [[Bococom|hardware/routers/Bococom-DWR150]], et je gère quelques noeuds.
 
- * nicolas@marchildon.net
- * http://identi.ca/elecnix
- * 514 394-7847
+Je suis programmeur. J'ai installé une antenne chez moi, avant la naissance du projet, pour envoyer des backups chez mon frère. J'ai installé OpenWrt sur le petit routeur [[Bococom|hardware/routers/Bococom-DWR150]], et je gère quelques noeuds.
 
 Les relais que j'administre:
 

s/firmware/openwrt
diff --git a/documentation/quickstart.mdwn b/documentation/quickstart.mdwn
index 680d7d34..3380e4d8 100644
--- a/documentation/quickstart.mdwn
+++ b/documentation/quickstart.mdwn
@@ -1,5 +1,5 @@
 {!items to fill manually!}
-## 1. FLASH FIRMWARE
+## 1. FLASH OPENWRT
 ## 2. SET PASSWORD, WRITE IT DOWN!
 ## 2.1. SET DROPBEAR TO LAN!
 ## 3. SSH IN (NO host verification! It will raise problems if you reflash.)

Added quick-start guide to install a relay.
diff --git a/documentation.mdwn b/documentation.mdwn
index eba08861..4b06d8fc 100644
--- a/documentation.mdwn
+++ b/documentation.mdwn
@@ -17,6 +17,8 @@
 
 # Comment rejoindre le réseau / How to join the network
 
+[[Quickstart guide meant to get a relay up and running ASAP|quickstart]] (lacks wiki integration and physical install steps, assumes you have a router already)
+
 On peut rejoindre (et agrandir) le réseau de deux façons: par un relais et par un point d'accès. (voir [[topology|policy/topology/]])
 
 Les relais tissent la toile du réseau "mesh". Ils sont généralement installés sur le toit ou dans une fenêtre. Une fois configuré, un relais se connecte aux relais voisins et calcule le chemin le plus court pour se rendre d'un point A à un point B. C'est en installant de nouveaux relais que l'on fait grandir le réseau. Même si aucun noeud n'est disponible, vous pouvez laisser votre relais en place. Un jour, quelqu'un s'y connectera!
@@ -39,6 +41,8 @@ protocole "Babel", mais les images ne sont plus à jour
 depuis 2014. Voir [[guides/install+node+facile/]] pour cette
 documentation.
 
+
+
 # Développement
 
 * [[Hardware]] - hardware (routers, cables, antennas) used in the project, and how it's configured, includes radio theory

Added a quick-start guide I wrote to streamline node flashing
diff --git a/documentation/quickstart.mdwn b/documentation/quickstart.mdwn
new file mode 100644
index 00000000..680d7d34
--- /dev/null
+++ b/documentation/quickstart.mdwn
@@ -0,0 +1,104 @@
+{!items to fill manually!}
+## 1. FLASH FIRMWARE
+## 2. SET PASSWORD, WRITE IT DOWN!
+## 2.1. SET DROPBEAR TO LAN!
+## 3. SSH IN (NO host verification! It will raise problems if you reflash.)
+
+## 4. ADHOC.
+Important: despite what the doc used to say,
+{!name!}.relais.reseaulibre.ca is NOT supported. It breaks Babel.
+
+SSH:
+
+    uci delete wireless.radio0.disabled
+    uci set wireless.radio0.channel=1
+    uci set wireless.@wifi-iface[0].mode=adhoc
+    uci set wireless.@wifi-iface[0].ssid=relais.reseaulibre.ca
+    uci set wireless.@wifi-iface[0].bssid=02:CA:FF:EE:BA:BE
+    uci set wireless.@wifi-iface[0].network=wan
+    uci commit
+
+
+## 5. IPV4.
+DIVERGENCES FROM THE FULL DOC AHEAD! CAREFUL.
+
+SSH:
+
+    uci set network.wan=interface
+    uci set network.wan.ifname=wlan0
+    uci set network.wan.proto=static
+    uci set network.wan.ipaddr=172.16.{!addr!}.{!addr!}
+    uci set network.wan.netmask=255.255.255.255
+    uci commit
+
+
+Q: Why not uci set network.wan.netmask=255.240.0.0?
+
+A: It will rebroadcast 172.16.0.0 from 0.0.0.0. ...Why? Not too sure yet.
+
+
+## 6. (Optional) EXISTING LAN INTEGRATION.
+WEB INTERFACE:
+
+Interfaces -> LAN -> Protocol -> instead of Static Address, choose DHCP client
+
+Plug that thing into the net and hope... worst case, factory reset and start again
+
+## 7. IPV6
+Use the web interface to configure.
+
+```fd64:2c08:9fa7:{!something!}::1``` is the one I'm using. For smaller nodes, use
+
+```fd64:2c08:9fa7:{!something!}:{!something!}:1```
+
+## 8. BABEL.
+SSH:
+
+    opkg update
+    opkg install babeld
+    /etc/init.d/babeld enable
+    uci delete babeld.wan.ignore
+
+In /etc/babeld.conf put:
+
+    # mesh IPv6
+    redistribute local ip fd64:2c08:9fa7::/48 metric 128
+    redistribute ip fd64:2c08:9fa7::/48 metric 128
+
+    # mesh IPv4
+    redistribute local ip 172.16.0.0/12 metric 128
+    redistribute ip 172.16.0.0/12 metric 128
+
+    redistribute local deny
+    redistribute deny
+
+Open /etc/config/babeld, change:
+
+        option 'ifname' 'wlan'
+
+to
+
+        option 'ifname' 'wlan0'
+
+
+Remove ignore 'true' above that also.
+
+And uncomment conf_file and log_file. 
+
+Firewall settings:
+
+    config rule                                        
+            option name             Allow-Babel        
+            option src              wan                
+            option dest_port        6696               
+            option proto            udp                
+            option target           ACCEPT 
+
+
+If you're testing and one side can't see each other, check firewall settings on both ends. 
+
+## ?. STYLE POINTS:
+
+* Change /etc/banner to be fancy
+
+* Change your MAC address from the web interface

Updated Foulab desc
diff --git a/nodes/foulab.mdwn b/nodes/foulab.mdwn
index 0087e362..30765537 100644
--- a/nodes/foulab.mdwn
+++ b/nodes/foulab.mdwn
@@ -1,6 +1,6 @@
-[[!waypoint lat="45.47933" lon="-73.58979" embed hidden width="400px" height="400px" right desc="On the roof below the highway, with a view towards the channel"]]
+[[!waypoint lat="45.47933" lon="-73.58979" embed hidden width="400px" height="400px" right desc="Out of a 3rd-story window, with a view towards the hospital"]]
 
-[[Foulab|http://foulab.org/]]'s node is finally up! Wiring quirks make it work only when the lab is open... TODO: fix this.
+A window in [[Foulab|http://foulab.org/]] looking down along St Antoine.
 
  * MAC address: F0:0F:BA:5E:13:37
  * IP address: 172.16.0.25

This reverts commit a47dc0dd5736d8051fc3cb64495cde693960a3ac
diff --git a/nodes/foulab.mdwn b/nodes/foulab.mdwn
index c217c964..0087e362 100644
--- a/nodes/foulab.mdwn
+++ b/nodes/foulab.mdwn
@@ -9,7 +9,7 @@
  * Hardware: COMFAST CF-E110N
  * Power:
  * Location:
- * Status: [[!taglink up]]
+ * Status: [[!taglink planned]]
  * Links: 
  * Azimuth:
  * Panorama:

Format fix
diff --git a/nodes/foulab.mdwn b/nodes/foulab.mdwn
index de28e96f..c217c964 100644
--- a/nodes/foulab.mdwn
+++ b/nodes/foulab.mdwn
@@ -1,6 +1,7 @@
 [[!waypoint lat="45.47933" lon="-73.58979" embed hidden width="400px" height="400px" right desc="On the roof below the highway, with a view towards the channel"]]
 
 [[Foulab|http://foulab.org/]]'s node is finally up! Wiring quirks make it work only when the lab is open... TODO: fix this.
+
  * MAC address: F0:0F:BA:5E:13:37
  * IP address: 172.16.0.25
  * IPv6 address: fd64:2c08:9fa7:2070::1

Current Foulab status updated
diff --git a/nodes/foulab.mdwn b/nodes/foulab.mdwn
index 44cf9d65..de28e96f 100644
--- a/nodes/foulab.mdwn
+++ b/nodes/foulab.mdwn
@@ -1,7 +1,6 @@
-[[!waypoint lat="45.47933" lon="-73.58979" embed hidden width="400px" height="400px" right desc="On the roof below the highway, with a view south - east"]]
-
-Can't believe [[Foulab|http://foulab.org/]] isn't listed. Even though it's a fairly poor spot, below the highway, it could relay to verdun.
+[[!waypoint lat="45.47933" lon="-73.58979" embed hidden width="400px" height="400px" right desc="On the roof below the highway, with a view towards the channel"]]
 
+[[Foulab|http://foulab.org/]]'s node is finally up! Wiring quirks make it work only when the lab is open... TODO: fix this.
  * MAC address: F0:0F:BA:5E:13:37
  * IP address: 172.16.0.25
  * IPv6 address: fd64:2c08:9fa7:2070::1

diff --git a/nodes/foulab.mdwn b/nodes/foulab.mdwn
index d7389e3b..44cf9d65 100644
--- a/nodes/foulab.mdwn
+++ b/nodes/foulab.mdwn
@@ -9,7 +9,7 @@ Can't believe [[Foulab|http://foulab.org/]] isn't listed. Even though it's a fai
  * Hardware: COMFAST CF-E110N
  * Power:
  * Location:
- * Status: [[!taglink planned]]
+ * Status: [[!taglink up]]
  * Links: 
  * Azimuth:
  * Panorama:

update avail canada
diff --git a/documentation/power.mdwn b/documentation/power.mdwn
index 1df560b6..f94a28a6 100644
--- a/documentation/power.mdwn
+++ b/documentation/power.mdwn
@@ -450,3 +450,8 @@ Il y a également d'autres produits en vente [chez Canadian Tire](https://www.ca
 [Home Depot](https://www.homedepot.ca/en/home/categories/tools/automotive/automotive-batteries-and-chargers/battery-jump-starters.html) mais tous deux ont des spécifications qui sont *loin*
 des produits disponibles chez Amazon. De plus, ils ont moins de
 connecteurs et ne sont donc pas utiles pour nos projets radio.
+
+Update: j'ai trouvé quelquechose qui ressemble (en termes de
+spécifications) à un de ceux là, et qui est disponible au Canada, le
+[GREPRO 1500A Peak 21000mAh](https://www.amazon.ca/gp/product/B0751BFKRV/). Je mets à jour ici selon mes
+expériences quand la machine arrive.

docu sur les booster packs
diff --git a/documentation/power.mdwn b/documentation/power.mdwn
index 5a6de4cc..1df560b6 100644
--- a/documentation/power.mdwn
+++ b/documentation/power.mdwn
@@ -382,3 +382,71 @@ domestique (AC) dans le cas d'une coupure.
  [onduleur]: https://fr.wikipedia.org/wiki/Onduleur
 
 Tout comme les batteries, un UPS est évalué selon sa capacité en Ah.
+
+"Boosters"
+----------
+
+Les "boosters" sont devenus intéressants ici aussi parce que les
+batteries [lithium-ion](https://en.wikipedia.org/wiki/Lithium-ion_battery) (li-ion) sont de plus en plus
+performantes. Un ensemble de produits ont émergé récemment (2019) qui
+permettent de démarrer des voitures dont la batterie est trop
+faible. Ce [review (vidéo) de Project Farm](https://www.youtube.com/watch?v=JN8A2nIMUWA) est très intéressant
+car il montre à quel point les nouvelles batteries sont plus
+performantes que les anciens systèmes basé sur des batteries plus
+traditionnels.
+
+De plus, ces produits sont beaucoup plus petits et légers. Ils peuvent
+être également utilisés pour charger des appareils par USB et donner
+du courant DC, et donc sont grandement intéressants pour nos projets
+ici.
+
+Le review recommende ces produits:
+
+ 1. [Audew 20000mAh Peak 1500A Car Jump Starter](https://www.audew.com/Audew-20000mAh-Peak-1500A-Car-Jump-Starter-for-Any-Gas-Engine-or-Up-To-8-5L-Diesel-Engine-with-LCD-Power-Display-p-100058.html):
+    * 85$USD, backorder and not sold in Canada
+    * LED display
+    * power button
+    * flashlight
+    * input: USB-C
+    * outputs:
+      * USB-A 5V, 9V, 12V (?)
+      * USB-A 2.5V 2A
+      * 12V / 10A cigarette lighter
+      * battery clamps
+ 2. [Topvision 2200A Peak jump starter](https://topvisiontec.com/product/topvision-2200a-peak-jump-starter/):
+    * 59.2Wh
+    * 90$USD on Amazon, no delivery in Canada
+    * LED display
+    * power button
+    * flashlight
+    * input: USB-C 5V/3A
+    * outputs:
+      * USB-A 5V, 9V, 12V (?)
+      * USB-A 2.5V 2.1A
+      * 12V / 6A cigarette lighter
+      * battery clamps
+ 3. [DBPOWER 2000A 20800mAh](https://www.amazon.com/DBPOWER-19200mAh-Portable-Starter-Flashlight/dp/B07DWSYYZR/) and [Sanrock 2000A 16000mAh](https://www.amazon.com/Starter-SANROCK-Battery-Charger-Diesel/dp/B07RKHSFD9) (maybe
+    same manufacturer):
+    * 77Wh (DBPOWER) 59.2Wh (Sanrock)
+    * 73USD on Amazon, used/"like new" (Sanrock), no delivery to
+      Canada (DBPOWER)
+    * LCD screen
+    * power button
+    * flashlight
+    * input: 
+      * DBPOWER: 15V/3A USB-C in/out (?)
+      * Sanrock: 15V/1A USB-C in/out (?)
+    * output:
+      * 12V/10A cigarette lighter
+      * USB-A 5V/2.1A
+      * USB-A QC3
+
+Les autres produits qu'il a révisé ne semble pas très fiables. Le
+"[supercapacitor](https://www.amazon.com/autowit-Portable-Batteryless-Supercap-Ultra-Safe/dp/B07F8MJW8W/)" marche bien, mais il est plus gros et plus
+cher. De plus, il faut le charger avec la batterie déjà morte, ce qui
+prend du temps et pourrait endommager la batterie d'avantage.
+
+Il y a également d'autres produits en vente [chez Canadian Tire](https://www.canadiantire.ca/en/all-brands/motomaster/batteries-maintenance-accessories/battery-chargers-booster-packs-power-inverters/booster-power-packs.html?x1=Brand;q1=MotoMaster%7CMotoMaster%20Formula%201%7CMotoMaster%20OEPLUS%7CMotoMaster%20Eliminator%7CMotoMaster%20Eliminator%20Ultra%20AGM%7CMotoMaster%20Eliminator%20Ultra%20XD%7CMotoMaster%20Nautilus%7CMotoMaster%20Nautilus%20Ultra%20AGM%7CMotoMaster%20Nautilus%20Ultra%20XD;x2=ast-id-level-4;q2=automotive%3A%3Abatteries-maintenance-accessories%3A%3Abattery-chargers-booster-packs-power-inverters%3A%3Abooster-power-packs;x3=PS_Booster_Power_Pack;q3=Booster%20Packs;adlocation=LIT_BoostersPowerPacks_MotomasterBatteryChargersBoosterPacksPOwerInvertersCLP_en) et
+[Home Depot](https://www.homedepot.ca/en/home/categories/tools/automotive/automotive-batteries-and-chargers/battery-jump-starters.html) mais tous deux ont des spécifications qui sont *loin*
+des produits disponibles chez Amazon. De plus, ils ont moins de
+connecteurs et ne sont donc pas utiles pour nos projets radio.

diff --git a/nodes/foulab.mdwn b/nodes/foulab.mdwn
index bc85709e..d7389e3b 100644
--- a/nodes/foulab.mdwn
+++ b/nodes/foulab.mdwn
@@ -3,7 +3,7 @@
 Can't believe [[Foulab|http://foulab.org/]] isn't listed. Even though it's a fairly poor spot, below the highway, it could relay to verdun.
 
  * MAC address: F0:0F:BA:5E:13:37
- * IP address: 172.16.1.20
+ * IP address: 172.16.0.25
  * IPv6 address: fd64:2c08:9fa7:2070::1
  * Software: OpenWRT 18.06/Babel stack
  * Hardware: COMFAST CF-E110N

[nom-de-la-machine].relais.reseaulibre.ca ne marche pas avec Babel :(
diff --git a/policy/naming.mdwn b/policy/naming.mdwn
index efed88dc..febcdf2b 100644
--- a/policy/naming.mdwn
+++ b/policy/naming.mdwn
@@ -12,7 +12,7 @@ Il y a deux principaux types d'appareils connectés au réseau:
 Relais mesh
 : 
 * node qui fonctionne avec "babel" et qui a pour principal objectif de relayer le réseau
-* SSID: relais.reseaulibre.ca ou [nom-de-la-machine].relais.reseaulibre.ca
+* SSID: relais.reseaulibre.ca
 
 Point d'accès (AP)
 : 

Filling the Foulab node with tentative router info.
diff --git a/nodes/foulab.mdwn b/nodes/foulab.mdwn
index 4da93339..bc85709e 100644
--- a/nodes/foulab.mdwn
+++ b/nodes/foulab.mdwn
@@ -2,18 +2,18 @@
 
 Can't believe [[Foulab|http://foulab.org/]] isn't listed. Even though it's a fairly poor spot, below the highway, it could relay to verdun.
 
- * MAC address:
- * IP address:
- * IPv6 address:
- * Software:
- * Hardware:
+ * MAC address: F0:0F:BA:5E:13:37
+ * IP address: 172.16.1.20
+ * IPv6 address: fd64:2c08:9fa7:2070::1
+ * Software: OpenWRT 18.06/Babel stack
+ * Hardware: COMFAST CF-E110N
  * Power:
  * Location:
  * Status: [[!taglink planned]]
  * Links: 
  * Azimuth:
  * Panorama:
- * Operator: [[users/xsmurf]]
+ * Operators: [[users/xsmurf]],[[users/kryma]]
 
 [[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
 

add mysterious setup script i found on my laptop which might be useful
diff --git a/setup_reseaulibre b/setup_reseaulibre
new file mode 100644
index 00000000..4490d8a0
--- /dev/null
+++ b/setup_reseaulibre
@@ -0,0 +1,387 @@
+#!/bin/sh
+
+## FIXME: wlan0 devient AP, wlan0-1 adhoc
+## TODO: activer le ip forwarding
+
+usage()
+{
+    echo ""
+    echo "USAGE: "
+    echo "    setup_reseaulibre [lan interface] [ipv6 addr block] [ipv6 block lan] [ipv6 block ap]"
+    echo ""
+    echo "Arguments:"
+    echo "    lan interface: interface to configure (radvd)"
+    echo "    ipv6 address block (optional): IP block to export in babel."
+    echo "    ipv6 address block (optional): IP block to assign to the LAN."
+    echo "    ipv6 address block (optional): IP block to assign to the AP."
+    echo ""
+    echo "EXAMPLES:"
+    echo "    setup_reseaulibre br-lan"
+    echo "    setup_reseaulibre br-lan fd64:2c08:9fa7:30::1/60 fd64:2c08:9fa7:30::1/64 fd64:2c08:9fa7:31::1/64"
+    echo ""
+    echo "If you have an Internet connection, the script will try"
+    echo "to find the first free netblock."
+    echo ""
+    echo "Select a /60 IP block from: http://wiki.reseaulibre.ca/policy/numbering/"
+    echo "The block will be announced on your local network, so that the other"
+    echo "devices on that network can access the mesh."
+    echo ""
+    echo "WARNING: currently, the script assumes your device is"
+    echo "the 'lan' interface, which is equivalent to:"
+    uci get network.lan.ifname
+    exit 1
+}
+
+# Assuming ubiquity bullet/nano
+LED_PATH=/sys/devices/platform/leds-gpio/leds
+
+flash_forever() {
+  led=$1
+  VAL=0
+  while (true) ; do
+    if [ "$VAL" = "0" ] ; then VAL=255 ; else VAL=0 ; fi
+    echo $VAL > $LED_PATH/ubnt:$led/brightness
+    sleep 1
+  done
+}
+
+# Close all LEDs for the initial state (values: 0=off, 255=on)
+echo 0 > $LED_PATH/ubnt:red:link1/brightness
+echo 0 > $LED_PATH/ubnt:orange:link2/brightness
+echo 0 > $LED_PATH/ubnt:green:link3/brightness
+echo 0 > $LED_PATH/ubnt:green:link4/brightness
+
+# Check the number of arguments (only the first argument is mandatory)
+if [ $# -lt 1 ]
+then
+    usage
+fi
+
+CONF_INTERFACE=$1
+CONF_IPBLOCK_ALL=$2
+CONF_IPBLOCK_LAN=$3
+CONF_IPBLOCK_AP=$4
+
+# Check if the network interface is valid
+grep -qs $CONF_INTERFACE /proc/net/dev || {
+    echo "$CONF_INTERFACE: not a valid network interface, see ifconfig."
+    exit 1
+}
+
+WLAN_MAC=$(ifconfig wlan0 | grep HWaddr | awk '{print $5}')
+
+# If the IP block already known, it means the script was ran once already
+# so we can skip DHCP client configuration and IP block discovery (below).
+if [ "$CONF_IPBLOCK" == "" ]; then
+    echo "Configuring DHCP-client on the lan interface..."
+    echo 255 > $LED_PATH/ubnt:red:link1/brightness
+    uci set network.lan.proto=dhcp
+
+    # Configure a static IP address as well, as a fallback
+    # FIXME: aliases: eth4:5, eth4:6, .. are just a label for an additional IP address and not actual interfaces
+    # VLANs: eth4.0, eth4.1, eth4.3, vlan0, .. are created to partition a single layer 2 network into multiple virtual ones.
+    # c.f. http://wiki.openwrt.org/doc/networking/network.interfaces
+    uci set network.slan=interface
+    uci set network.slan.ifname=eth0.1
+    uci set network.slan.proto=static
+    uci set network.slan.ipaddr=192.168.77.77
+    uci set network.slan.netmask=255.255.255.0
+
+    uci commit
+    echo "Restarting network..."
+    /etc/init.d/network restart
+
+    # Need to sleep a few seconds in order to get an IP from the router
+    sleep 5
+fi
+
+# Test whether we received an IPv4 address (grep against inet6)
+IP4ADDR=`ip addr show dev eth0 | grep "inet " | awk '{print $2}'`
+if [ `echo -n "$IP4ADDR" | wc -l` != "0" ]; then
+    echo "Found IPv4 address: $IP4ADDR"
+    echo 255 > $LED_PATH/ubnt:orange:link2/brightness
+else
+    echo "Could not find IPv4 address.."
+fi
+
+# Determines whether we found an address using the wiki.
+# This is also used later (for report-back).
+# If the address was provided on the command-line, this stays "no".
+INET_FOUND="no"
+
+if [ "$CONF_IPBLOCK" = "" ]; then
+    ##
+    ## Test to see if we have an Internet connection
+    ##
+    echo "Testing for IPv6 upstream connection..."
+    
+    (ping6 -c 1 -q wiki.reseaulibre.ca | grep -qs "1 packet")
+    if [ $? -eq 0 ]; then
+        echo "... found IPv6 connection, yay!"
+        INET_FOUND="yes"
+    else
+        echo '... not found.'
+        echo "Testing for IPv4 upstream connection..."
+        $(ping -c 1 -q wiki.reseaulibre.ca | grep -qs "1 packet")
+        if [ $? -eq 0 ]; then
+            echo "... found IPv4 connection, yay!"
+            INET_FOUND="yes"
+        else
+            echo "*** ERROR: Could not ping the Reseau libre wiki."
+            echo "*** Please check: http://wiki.reseaulibre.ca/policy/numbering"
+            echo "*** and select a block manually."
+            flash_forever red:link1
+            # TODO Use a block based on our MAC address
+        fi
+    fi
+
+    ##
+    ## Download the list of available IP adresses and find a free netblock.
+    ## We use a /60 so that the user can have 16 subnets.
+    ## We will assign subnet 0 to the lan, and subnet 1 to the AP, i.e.
+    ## fd64:2c08:9fa7:[xxx][0-f]::/60 -> subnet for the relay
+    ## fd64:2c08:9fa7:[xxx]0::/64 -> subnet for the LAN (eth0)
+    ## fd64:2c08:9fa7:[xxx]1::/64 -> subnet for the AP (wlan0)
+    ## fd64:2c08:9fa7:[xxx]{2,f}::/64 -> not used
+    ##
+    if [ "$INET_FOUND" = "yes" ]; then
+        echo "Fetching known IPv6 addresses from the Reseau libre wiki..."
+        IPV6_EXISTING=`wget -q -O - http://wiki.reseaulibre.ca/policy/numbering/raw/ | grep fd64`
+
+        # Loop from 2 to 0xfff
+        for i in `seq 2 4095`; do
+            NETBLOCK=$(printf "%x" $i)
+            (echo $IPV6_EXISTING | grep -qs "fd64:2c08:9fa7:$NETBLOCK[0-9a-fA-F]:") || {
+                CONF_IPBLOCK_ALL="fd64:2c08:9fa7:${i}0::1/60"
+                CONF_IPBLOCK_LAN="fd64:2c08:9fa7:${i}0"
+                CONF_IPBLOCK_AP="fd64:2c08:9fa7:${i}1"
+                echo "... {$CONF_IPBLOCK_ALL} found, yippee!"
+                echo "... ${CONF_IPBLOCK_LAN}::/64 will be used for the LAN"
+                echo "... ${CONF_IPBLOCK_AP}::/64 will be used for the AP"
+                break
+            }
+        done
+    fi
+    
+    if [ "$CONF_IPBLOCK_LAN" = "" ]; then
+        echo "*** ERROR: could not find an available IP block."
+        echo "*** Please check: http://wiki.reseaulibre.ca/policy/numbering"
+        echo "*** and select a block manually."
+        exit;
+        # TODO Use a block based on our MAC address
+    fi
+fi
+
+# We managed to contact the wiki and get an IPv6 netblock
+echo 255 > $LED_PATH/ubnt:green:link3/brightness
+
+##
+## Configure the LAN interface
+## NB: we assign the biggest block (ex: /60), since that is what babel will export.
+##
+echo "Setting: uci set network.lan.ip6addr=${CONF_IPBLOCK_ALL}"
+uci set network.lan.ip6addr="${CONF_IPBLOCK_ALL}"
+ip -6 addr add ${CONF_IPBLOCK_ALL} dev ${CONF_INTERFACE}
+
+# (end of discovery & configuration when block not already known)
+
+if [ "$INET_FOUND" = "yes" ]; then
+  echo "Web-pinging remote sites to announce our IP addresses"
+  PARAMS="wlanmac=${WLAN_MAC}&ipv4=$IP4ADDR&ipv6=${CONF_IPBLOCK_ALL}"
+  wget -q -O - "http://reseaulibre.ca/ping?${PARAMS}"
+  wget -q -O - "http://reseaulibre.herokuapp.com/ping?${PARAMS}"
+  wget -q -O - "http://reseaulibre.deuxpi.ca/ping?${PARAMS}"
+  wget -q -O - "http://www.bidon.ca/rl-ping?${PARAMS}"

(Diff truncated)
slow down bots who are hitting too hard and disallow CGI
This bot was hammering my server tonight and causing some load spikes:
208.110.93.78 - - [05/Sep/2018:22:01:01 -0400] "GET /ikiwiki.cgi?from=users/martn&do=create&page=Discussion HTTP/1.1" 200 7687 "-" "Mozilla/5.0 (compatible; MJ12bot/v1.4.8; http://mj12bot.com/)"
It was just crawling user creation pages too which was annoying. the
resulting robots.txt should solve that.
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 00000000..71fe39d5
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,5 @@
+User-agent: *
+Crawl-delay: 10
+
+User-agent: *
+Disallow: /ikiwiki.cgi?

diff --git a/users/R.mdwn b/users/R.mdwn
index 0858a71c..183b7f0a 100644
--- a/users/R.mdwn
+++ b/users/R.mdwn
@@ -1,40 +1,13 @@
 # Alexandre Guédon
-[[!img ag.jpg align="right" size="150x"]]
-
-Je roule du wifi ouvert chez moi depuis longtemps et me voilà entouré de semblables!
+[[!img ag.jpg align="right" size="100x"]]
 
 * courriel: total world domination (à) g mail point, "comme" ;)
-* site: [[TWD|http://twd.su]]
 
 ## Mes Noeuds
 
 ### Maison:
 * [[nodes/R]] (relais principal)
-* [[nodes/R-nord]] (accès à upgrader)
-* [[nodes/R-sud]] (accès à installer)
-
-### Portable:
-* [[nodes/R-agile]] (à configurer pour noeuds d'événement, demo, etc.)
-
-### À déployer:
-* [[nodes/R-pop]] (à configurer / envoyer dans la famille?)
 
 ## Autres infos
 
 Radio amateur: VE2TUX
-
-## Todo
-### hardware
-
-* Finir setup (relais.), tests, upgrade AA, etc.
-* installer & upgrader(?) (acces.) x 2
-* nœuds portable / solaire de test
-* Noeuds parent
-* ...
-
-### Software
-
-* Transparent tor proxy
-* service discovery
-* projet de portail HTML5 ?
-* ???

Antenne débranchée
diff --git a/nodes/R.mdwn b/nodes/R.mdwn
index 1d51788f..3f5be8bf 100644
--- a/nodes/R.mdwn
+++ b/nodes/R.mdwn
@@ -1,49 +1,14 @@
 ### Vue vers le nord (montréalais)
 
-[[!img 2012-09-11-r-nord.jpg size=950x alt="panorama nord" ]]
-
-[[!ymlfront data="""
-MAC: DC:9F:DB:06:D4:CC
-IP: 172.16.0.33
-IPv6: 2607:f2c0:f00f:e100::/56
-"""]]
 
 # SETUP
 Operateur: [[users/R]]
 
-En face du Parc des Amériques :
-
-[[!waypoint lat="45.518630" lon="-73.58223" embed hidden width="950px" height="300px" right desc="Bullet M2 + 15dBi"]]
-
-Bullet M2 + 15dBi
-
-# NODE - r.relais.reseaulibre.ca
-[[!img antenne_mat.jpg alt="antenne sur mat" align="right" size="x380" ]]
-
- * Status: [[!taglink up]] depuis 29/10/12
- * Hostname: r.relais.reseaulibre.ca
- * Location: 45.518630,-73.58223
- * Software: OpenWRT 12.09-beta1
- * IP address: IP
- * IPv6 address: IPv6
- * Routage: babeld
- * Hardware: Ubnt Bullet M2
- * MAC address: MAC
- * Channel: 1
- * 802.11: b, g, n
- * Autonomie estimée: 15-30 minutes (UPS)
-
+# NODE
+ * Status: [[!taglink down]]
 ### Antenna
- * Azimuth: H: 360° / V: 6°
- * Frequency: 2400 - 2483MHz
- * Gain: 15 dBi
- * Polarization: Vertical
- * SWR : ≤ 1.5:1
- * Impedance: 50 Ohm
- * Power: 4W (Max EIRP)
 
 ### Links
- * Links: [[R-nord]], [[R-sud]] (ethernet)
  * Links: [[Qualité du lien|http://wiki.reseaulibre.ca/stats/]]
 
 ### Vue vers le sud (montréalais)

removed
diff --git a/nodes/R-sud.mdwn b/nodes/R-sud.mdwn
deleted file mode 100644
index 15280d78..00000000
--- a/nodes/R-sud.mdwn
+++ /dev/null
@@ -1,51 +0,0 @@
-### Vue vers le sud (montréalais)
-[[!img /nodes/R/2012-09-11-r-sud.jpg size=950x]]
-
-[[!ymlfront data="""
-MAC: 00:15:6D:70:37:25
-IP: 172.16.1.32
-IPv6: 2607:f2c0:f00f:e1e2::/64
-"""]]
-
-# SETUP
-Operateur: [[users/R]]
-
-Point d'accès public en face du Parc des Amériques :
-
-[[!waypoint lat="45.518622" lon="-73.58211" embed hidden width="950px" height="300px" right desc="NSM2 dans ma fenetre sud"]]
-
-Pour l'instant, un AP 802.11b/g dans ma fenêtre (côté nord du building)
-
-
-# NODE - r-sud.acces.reseaulibre.ca
- * Type: accesspoint
- * Status: [[!taglink planned]]
- * Hostname: r-sud.acces.reseaulibre.ca
- * Location: 45.518622,-73.58211
- * Software: OpenWRT 12.09 (AA final)
- * IP address: ( Planned: IP )
- * IPv6 address: IPv6
- * Hardware: Ubnt NanoStation M2
- * MAC address: MAC
- * Channel: ?
- * 802.11: b, g, n
-
-### Antenna
- * Azimuth: H: 60° / V: 60°
- * Frequency: 2400 - 2483MHz
- * Connector Built-in
- * Gain: 11 dBi
- * Power: 28 dBm?
-
-### Links
-* Links: [[R]], [[R-nord]] (ethernet)
-
-[[!meta copyright="Copyright © 2012 Alexandre Guédon"]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|meta/gfdl]]."]]"""]]

removed
diff --git a/nodes/R-nord.mdwn b/nodes/R-nord.mdwn
deleted file mode 100644
index 9e14dc78..00000000
--- a/nodes/R-nord.mdwn
+++ /dev/null
@@ -1,51 +0,0 @@
-### Vue vers le nord (montréalais)
-
-[[!img /nodes/R/2012-09-11-r-nord.jpg size=950x]]
-
-[[!ymlfront data="""
-MAC: DC:9F:DB:10:D4:61
-IP: 172.16.1.33
-IPv6: 2607:f2c0:f00f:e1e3::/64
-"""]]
-
-# SETUP
-Operateur: [[users/R]]
-
-Point d'accès public vers le nord du bloc :
-
-[[!waypoint lat="45.518629" lon="-73.58216" embed hidden width="950px" height="300px" right desc="NSM2 dans ma fenetre nord"]]
-
-Pour l'instant, un AP 802.11b/g dans ma fenêtre (côté nord du building)
-
-# NODE - r-nord.acces.reseaulibre.ca
- * Type: access point
- * Status: [[!taglink planned]]
- * Hostname: r-nord.acces.reseaulibre.ca
- * Location: 45.518629,-73.58216
- * Software: OpenWRT 12.09 (AA final)
- * IP address: ( Planned: IP )
- * IPv6 address: IPv6
- * Hardware: Ubnt NanoStation M2
- * MAC address: MAC
- * Channel: ?
- * 802.11: b, g, n
-
-### Antenna
- * Azimuth: H: 60° / V: 60°
- * Frequency: 2400 - 2483MHz
- * Connector Built-in
- * Gain: 11 dBi
- * Power: 28 dBm?
-
-### Links
-* Links: [[R]], [[R-sud]] (ethernet)
-
-[[!meta copyright="Copyright © 2012 Alexandre Guédon"]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|meta/gfdl]]."]]"""]]

diff --git a/nodes/whitman.mdwn b/nodes/whitman.mdwn
new file mode 100644
index 00000000..a7d6b683
--- /dev/null
+++ b/nodes/whitman.mdwn
@@ -0,0 +1,62 @@
+[[!waypoint lat="45.473108" lon="-73.6261746" embed hidden width="950px" height="400px" right desc="A node on my balcony"]]
+
+# Technical details
+
+[[!ymlfront data="""
+MAC: (mac address here)
+IP: (pick one from [[policy/numbering]])
+IPv6: 
+"""]]
+
+hostname
+: whitman
+
+Type
+: relay (can also be accesspoint, test, server)
+
+SSID
+: whitman.relais.reseaulibre.ca (see [[policy/naming]])
+
+MAC address
+: MAC
+
+IPv6 address
+: IPv6
+
+IP address
+: IP
+
+Hardware
+: 
+
+Location
+: (where is this node physically installed?)
+
+Status
+: [[!taglink prospect]] (can also be up, down, planned, unknown)
+
+Operator
+: [[/users/njloof]]
+
+Links
+: (a wiki link to the nodes this node is connected with, will show up on the map, metadata in [[links]])
+
+# Services
+
+(you can document services accessible from this location)
+
+# Photos
+
+(You can upload images when you edit this page. Feel free to upload photos
+of your installation or of the panorama. It will help other people who may
+want to link with you.)
+
+[[!meta copyright="Copyright © 2011-2013 Your Name Here"]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|meta/gfdl]]."]]"""]]

removed
diff --git a/nodes/Dalhousie.mdwn b/nodes/Dalhousie.mdwn
deleted file mode 100644
index dc413100..00000000
--- a/nodes/Dalhousie.mdwn
+++ /dev/null
@@ -1,62 +0,0 @@
-[[!waypoint lat="45.5111815" lon="-73.5501785" embed hidden width="950px" height="400px" right desc="A node on the west side of the building"]]
-
-# Technical details
-
-[[!ymlfront data="""
-MAC: (mac address here)
-IP: (pick one from [[policy/numbering]])
-IPv6: 
-"""]]
-
-hostname
-: (node hostname here)
-
-Type
-: relay (can also be accesspoint, test, server)
-
-SSID
-: Dalhousie.reseaulibre.ca (see [[policy/naming]])
-
-MAC address
-: MAC
-
-IPv6 address
-: IPv6
-
-IP address
-: IP
-
-Hardware
-: Nanostation M2
-
-Location
-: (where is this node physically installed?)
-
-Status
-: [[!taglink planned]] (can also be up, down, planned, unknown)
-
-Operator
-: [[/users/njloofbourrow]]
-
-Links
-: (a wiki link to the nodes this node is connected with, will show up on the map, metadata in [[links]])
-
-# Services
-
-(you can document services accessible from this location)
-
-# Photos
-
-(You can upload images when you edit this page. Feel free to upload photos
-of your installation or of the panorama. It will help other people who may
-want to link with you.)
-
-[[!meta copyright="Copyright © 2011-2013 Your Name Here"]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|meta/gfdl]]."]]"""]]

diff --git a/users/Danukeru.mdwn b/users/Danukeru.mdwn
new file mode 100644
index 00000000..4a83a3d9
--- /dev/null
+++ b/users/Danukeru.mdwn
@@ -0,0 +1,21 @@
+# Danukeru
+
+* courriel: danukeru[.a.t.]foulab.org
+* site: [[danuke.ru|https://danuke.ru]]
+
+## Mes Noeuds
+
+* [[nodes/Slynet-00]] 
+* [[nodes/Slynet-01]] 
+* [[nodes/foulab]]
+
+
+## Todo
+### hardware
+
+* Tie into new foulab server hardware.
+
+### Software
+
+* Transparent TOR/I2P/VPN proxy
+* Upgrade everything to https://github.com/libremesh/lime-packages

diff --git a/nodes/Slynet-00.mdwn b/nodes/Slynet-00.mdwn
new file mode 100644
index 00000000..c23678f0
--- /dev/null
+++ b/nodes/Slynet-00.mdwn
@@ -0,0 +1,55 @@
+[[!waypoint lat="45.47152" lon="-73.59261" embed hidden width="400px" height="400px" right desc="On Fattal rooftop."]]
+
+Un noeud sur le toit, au-dessus du viaduc Rosemont-Van Horne.
+
+[[!ymlfront data="""
+MAC: 00:27:23:2F:BD:14
+IP: 
+IPv6: 
+"""]]
+
+hostname
+: slynet-00
+
+MAC address
+: MAC
+
+IPv6 address
+: IPv6
+
+IP address
+: IP
+
+Software
+: [https://github.com/libremesh/lime-packages]
+
+Hardware
+: Ubiquity Bullet M2 + 15 dBi omnidirectional antenna
+
+Power
+: 15dBm/28mW (default)
+
+Location
+: On the roof of Fattal 
+
+Azimuth
+: 360°
+
+Panorama
+: 
+Status
+: [[!taglink up]]
+
+Operator
+: [[/users/Danukeru]]
+
+
+[[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|meta/gfdl]]."]]"""]]

removed
diff --git a/nodes/Slynet-00.mdwn b/nodes/Slynet-00.mdwn
deleted file mode 100644
index c8e5b0d8..00000000
--- a/nodes/Slynet-00.mdwn
+++ /dev/null
@@ -1,63 +0,0 @@
-[[!waypoint lat="45.511142" lon="-73.628985" embed hidden width="400px" height="400px" right desc="Super secret base of operations. Oh wait..."]]
-
-Danukeru's node. Have hardware and roof access. Can be up if someone pops up within 500 meters.
-
-# Technical details
-
-[[!ymlfront data="""
-MAC: (mac address here)
-IP: (pick one from [[policy/numbering]])
-IPv6: 
-"""]]
-
-hostname
-: SLYNET-00
-
-SSID
-: SLYNET.00.relais.reseaulibre.ca
-
-MAC address
-: MAC
-
-IPv6 address
-: IPv6
-
-IP address
-: IP
-
-Software
-: OpenWRT
-
-Hardware
-: Ubiquiti Bullet
-
-Power
-: 
-
-Location
-: (where is this node physically installed?)
-
-Azimuth
-: 360°
-
-Panorama
-: N/A
-
-Status
-: [[!taglink planned]] (can also be up, down, planned, unknown)
-
-Operator
-: [[users/Danukeru]]
-
-Links
-: (a wiki link to the nodes this node is connected with, will show up on the map, metadata in [[links]])
-
-[[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|meta/gfdl]]."]]"""]]

add notes about testers and crimpers
diff --git a/hardware/cabling.mdwn b/hardware/cabling.mdwn
index b8f7e534..a79f10d0 100644
--- a/hardware/cabling.mdwn
+++ b/hardware/cabling.mdwn
@@ -92,6 +92,20 @@ Note that this can be difficult to use under windy conditions.
 
 Else, if you have one of those connectors that have a small, round metal tube leg, you can also squeeze the ground wire by inserting then pressing. It's not as good as a soldered connection, but it will do if you do not have access to a soldering iron.
 
+# Cable testers and tools
+
+A [cable tester](https://en.wikipedia.org/wiki/Cable_tester) is very useful to confirm that a crimp is
+working. Good ones will test individual wires in sequence including
+the ground. It may also be useful to have a [tone generator](https://en.wikipedia.org/wiki/Signal_generator) that
+can be used to trace cables if you end up with lots of cables lying
+around.
+
+A full crimping crimping kit like [this one at monoprice](https://www.monoprice.com/product?c_id=105&cp_id=10509&cs_id=1050905&p_id=8135&seq=1&format=2) costs
+175$ including the tester and tone generator, whereas the tester only
+costs [around 70$](https://www.monoprice.com/Product?c_id=105&cp_id=10524&cs_id=1052402&p_id=8132&seq=1&format=2) A "[Fluke](https://en.wikipedia.org/wiki/Fluke_Corporation)" is also a brand-named tool that
+is well known among network engineers, although I am not sure which
+exact model is relevant here.
+
 # Antenna cables
 
 Mainly there is also 3 type of cable: all of them have an impedance of 50 ohms.

diff --git a/nouvelles/2013-04-Rencontre-Verdun.mdwn b/nouvelles/2013-04-Rencontre-Verdun.mdwn
index dafae29d..22ba1a5d 100644
--- a/nouvelles/2013-04-Rencontre-Verdun.mdwn
+++ b/nouvelles/2013-04-Rencontre-Verdun.mdwn
@@ -10,7 +10,6 @@ Venez rencontrer d'autres participants de Réseau Libre. Nous ferons une courte
 
 Abonnez-vous à la [[liste d'annonces|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nouvelles-reseaulibre.ca]] pour être informé de tout changement.
 
-Contact: 514-767-3975.
 
 Événements à surveiller
 =======================

more hardware install details
diff --git a/hardware/install.mdwn b/hardware/install.mdwn
index c83a288f..690ed15c 100644
--- a/hardware/install.mdwn
+++ b/hardware/install.mdwn
@@ -47,16 +47,18 @@ To install an antenna on your roof, you will need at least the
 following hardware:
 
  * mast & anchor: something to raise the antenna from the roof, if
-   only a little
+   only a little - see [[antennes]] for details
  * anchor holdings:
    * concrete anchor bolts, if you drill it into concrete
    * tripod with sandbags
- * plastic cable holders to secure the cable
- * exterior-grade shielded network cable
+ * regular RJ-45 [patch cables](https://en.wikipedia.org/wiki/Patch_cable) - to connect to the router without
+   having to crimp cables!
+ * exterior-grade shielded network cable, see [[cabling]] for details
  * [shielded](https://en.wikipedia.org/wiki/Twisted_pair#Cable_shielding) [RJ-45 connectors](https://en.wikipedia.org/wiki/Modular_connector#8P8C)
- * [hose clamps](https://en.wikipedia.org/wiki/Hose_clamp)
+ * plastic cable holders to secure the cable
+ * [hose clamps](https://en.wikipedia.org/wiki/Hose_clamp) may be useful to tie antennas to masts
  * [sealing tape](http://www.homedepot.ca/product/nashua-stretch-seal-silicone-sealing-tape-black-1in-x-10ft/959973), to seal the antenna connection with the router
-   (for Bullets)
+   (for Bullets) - or [electric tape](https://en.wikipedia.org/wiki/Electrical_tape) works as well
  * [duct tape](https://en.wikipedia.org/wiki/Duct_tape), for extreme hacks
  * [tie-wraps](https://en.wikipedia.org/wiki/Cable_tie), same
  * if using a 15 db omni antenna, two spacers to prevent the router
@@ -66,11 +68,12 @@ following hardware:
 
 And tools:
 
- * screwdriver
+ * [screwdriver](https://en.wikipedia.org/wiki/Screwdriver) with various heads
  * [X-acto](https://en.wikipedia.org/wiki/X-Acto)
  * [crimping tool](https://www.computerhope.com/jargon/c/crimp.htm) (and know [how to use it](http://www.wikihow.com/Crimp-Rj45), especially [with shielded cables](https://www.youtube.com/watch?v=Yo3-ObGOJig)
  * cable tester (e.g. [Amazon](https://www.amazon.com/Greenlee-70025-Network-Cable-Tester/dp/B000KMHL8M) or [Home Depot](http://www.homedepot.com/p/DataShark-RJ45-Network-Cable-Tester-with-Case-and-Patch-Cords-PA70025/205972192))
  * pliers with a cutting edge
+ * [locking pliers](https://en.wikipedia.org/wiki/Locking_pliers) (AKA "vise grip")
  * drill and drill bits, hammer drill if you drill through concrete
  * long drill bit (and drill) if you drill through wall or window
    frame (at least 30cm)

add links to various utilities and tools to clarify wtf they are
diff --git a/hardware/install.mdwn b/hardware/install.mdwn
index c7f10322..c83a288f 100644
--- a/hardware/install.mdwn
+++ b/hardware/install.mdwn
@@ -52,23 +52,24 @@ following hardware:
    * concrete anchor bolts, if you drill it into concrete
    * tripod with sandbags
  * plastic cable holders to secure the cable
- * exterior-grade network cable
- * shielded RJ-45 connectors
- * hose clamps
+ * exterior-grade shielded network cable
+ * [shielded](https://en.wikipedia.org/wiki/Twisted_pair#Cable_shielding) [RJ-45 connectors](https://en.wikipedia.org/wiki/Modular_connector#8P8C)
+ * [hose clamps](https://en.wikipedia.org/wiki/Hose_clamp)
  * [sealing tape](http://www.homedepot.ca/product/nashua-stretch-seal-silicone-sealing-tape-black-1in-x-10ft/959973), to seal the antenna connection with the router
    (for Bullets)
- * duct tape, for extreme hacks
- * tie-wraps, same
+ * [duct tape](https://en.wikipedia.org/wiki/Duct_tape), for extreme hacks
+ * [tie-wraps](https://en.wikipedia.org/wiki/Cable_tie), same
  * if using a 15 db omni antenna, two spacers to prevent the router
    from touching the mast (see [[/user/elecnix]] for specifics)
  * water: it gets hot up there
- * power bar & 50' extension cord, esp. if drills are not battery-powered!
+ * [power strip](https://en.wikipedia.org/wiki/Power_strip) & 50' [extension cord](https://en.wikipedia.org/wiki/Extension_cord), esp. if drills are not battery-powered!
 
 And tools:
 
  * screwdriver
- * crimping tool
- * cable tester
+ * [X-acto](https://en.wikipedia.org/wiki/X-Acto)
+ * [crimping tool](https://www.computerhope.com/jargon/c/crimp.htm) (and know [how to use it](http://www.wikihow.com/Crimp-Rj45), especially [with shielded cables](https://www.youtube.com/watch?v=Yo3-ObGOJig)
+ * cable tester (e.g. [Amazon](https://www.amazon.com/Greenlee-70025-Network-Cable-Tester/dp/B000KMHL8M) or [Home Depot](http://www.homedepot.com/p/DataShark-RJ45-Network-Cable-Tester-with-Case-and-Patch-Cords-PA70025/205972192))
  * pliers with a cutting edge
  * drill and drill bits, hammer drill if you drill through concrete
  * long drill bit (and drill) if you drill through wall or window
@@ -79,4 +80,4 @@ Not absolutely necessary, but can be really useful:
 
  * VHF radios to talk between the roof and ground, or between relays
  * long measuring tape or spool to determine cable length
- 
+

fix broken link
diff --git a/documentation.mdwn b/documentation.mdwn
index a502907e..eba08861 100644
--- a/documentation.mdwn
+++ b/documentation.mdwn
@@ -29,7 +29,7 @@ Pour configurer un relais:
 2. [[Configuration le mode réseau adhoc|ad-hoc]] [[!trailitem ad-hoc]]
 3. [[Configuration IP|ip]] / [[IPv6]] [[!trailitem ip]] [[!trailitem ipv6]]
 4. [[Configuration Babel|babel/]] [[!trailitem babel]]
-5. [[Installation physique|install]] [[!trailitem install]]
+5. [[Installation physique|hardware/install]] [[!trailitem hardware/install]]
 
 NB: on peut configurer un relais et un point d'accès sur le même
 appareil. Ce sera plus lent, mais pour démarrer, ça peut éviter

merge all install notes in one shiny new page
diff --git a/documentation.mdwn b/documentation.mdwn
index 847dd8ed..a502907e 100644
--- a/documentation.mdwn
+++ b/documentation.mdwn
@@ -24,12 +24,12 @@ Les relais tissent la toile du réseau "mesh". Ils sont généralement installé
 Pour configurer un relais:
 
 1. [[Identifier votre emplacement sur la carte|nodes]] - même si vous en êtes qu'à l'étape de projet, ça encouragera vos voisins à participer également.
-2. [[Préparer l'installation physique|analyse]] - suggestions de points à évaluer (photos du toit, etc)
 3. [[Se procurer le matériel nécessaire|hardware]]
 1. [[Installation de OpenWRT|flashing/]] [[!trailitem flashing]]
 2. [[Configuration le mode réseau adhoc|ad-hoc]] [[!trailitem ad-hoc]]
 3. [[Configuration IP|ip]] / [[IPv6]] [[!trailitem ip]] [[!trailitem ipv6]]
 4. [[Configuration Babel|babel/]] [[!trailitem babel]]
+5. [[Installation physique|install]] [[!trailitem install]]
 
 NB: on peut configurer un relais et un point d'accès sur le même
 appareil. Ce sera plus lent, mais pour démarrer, ça peut éviter
diff --git a/documentation/analyse.mdwn b/documentation/analyse.mdwn
deleted file mode 100644
index ac7cac34..00000000
--- a/documentation/analyse.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-(cette page est une ébauche, n'hésitez pas à y ajouter vos suggestions)
-
-Voici une liste de suggestions de points à vérifier avant d'installer une antenne:
-
-### Installation sur un toit
-
-* Combien d'étages a l'édifice?
-* Photos du toit comme tel, et du panorama (ex: [[nodes/deuxpi]], [[nodes/lacou]])
-* Est-ce qu'on peut installer sur le toit?
-* Y a-t-il des ancres sur le toit que l'on pourrait re-utiliser? Ex: un vieux récepteur Express Vu, un mât d'antenne télévision, etc.
-* Est-ce que l'on peut poser une nouvelle ancre? (sur la cheminée, sur le bord du toit, ..)
-* Est-ce que le propriétaire du bâtiment est d'accord avec l'installation? Si oui, à quel endroit?
-* Y a-t-il moyen de passer un câble ethernet pour alimenter l'antenne? Généralement cela implique de passer un câble ethernet à travers un cadre de fenêtre ou de porte. Souvent on peut enlever un vieux câble vidéotron, par exemple. Sinon percer un nouveau trou n'est pas compliqué.
-
-### Installation dans une fenêtre
-
-* À quel étage?
-* Y a-t-il une ligne de vue à partir de la fenêtre? Sinon, y a-t-il des voisins intéressés à poser une antenne sur leur toit?
-
-[[!img rl-antennes-exemples.jpg align="left" alt="Exemples d'antennes sur toits"]]
-
-Exemples: [[nodes/amman]] (soucoupe) /[[nodes/bgm-latakia]] (bullet omni, par dessus l'antenne TV), [[nodes/tarator]], [[nodes/boulette]], [[nodes/grace]].
-
-## Liens externes
-
- * [[Learn Rooftop Basics|https://commotionwireless.net/docs/cck/building-mounting/learn-rooftop-basics/]]
diff --git a/guides/install+node+facile.mdwn b/guides/install+node+facile.mdwn
index 0d19f30e..b16acf43 100644
--- a/guides/install+node+facile.mdwn
+++ b/guides/install+node+facile.mdwn
@@ -100,30 +100,4 @@ Read the guide on [[Securing your device|securing+device]] to know how to setup
 
 # Installation checklists
 
-## So, you want an antenna on your roof?
-
-Okay, but first:
-
-0. Take pictures of the installation location.
-0. Get clearance from the building owner.
-0. Figure one or two ways to run the network cable from the antenna to a power outlet.
-0. Buy the antenna and router.
-0. Flash the router with the firmware and test that you have access to it by wifi and wire.
-0. Get the hardware to mount the antenna.
-0. Find someone with installation experience to help you.
-0. Schedule installation when you have sun or light for 3 hours.
-
-## Ready to climb? Not so fast!
-
-You will need:
-
-0. A mast, if there isn't already one you can bolt the antenna to.
-0. A way to secure the mast.
-0. Concrete anchor bolts.
-0. A hammering drill and drill bit, for drilling holes in concrete.
-0. A long drill bit to drill through a wall or window frame (at least 30cm)
-0. Exterior-grade network cable.
-0. Plastic cable holders with screws, to secure the network cable along its route.
-0. Shielded RJ45 connectors with crimping tool, and cable tester.
-0. [[Sealing tape|http://www.homedepot.ca/product/nashua-stretch-seal-silicone-sealing-tape-black-1in-x-10ft/959973]], to seal the antenna connection with the router (for Bullets).
-0. If using a 15 db omni antenna, two spacers to prevent the router from touching the mast (see [[/user/elecnix]] for specifics)
+See [[hardware/install]].
diff --git a/hardware.mdwn b/hardware.mdwn
index 2a33a7a8..2e78c438 100644
--- a/hardware.mdwn
+++ b/hardware.mdwn
@@ -13,6 +13,7 @@ Le réseau de Montréal préconise la bande de fréquence 2.4 GHz.
  * [[Câblage et connecteurs|cabling]]
  * [[Antennes]] - antennas and external adapters
  * [[Radio]] - radio theory and practice, channels, protocols to use
+ * [[Install]] - installation sur les toits: matériel nécessaire, etc
 
 Voir aussi:
 
diff --git a/hardware/install.mdwn b/hardware/install.mdwn
new file mode 100644
index 00000000..c7f10322
--- /dev/null
+++ b/hardware/install.mdwn
@@ -0,0 +1,82 @@
+Install planning
+================
+
+Before you go up on the roof with the hardware:
+
+0. Get clearance from the building owner to inspect the roof.
+0. Take pictures of the installation location.
+0. Figure one or two ways to run the network cable from the antenna to
+   a power outlet.
+0. Get clearance from the owner to do the actual install.
+0. Buy the antenna and router.
+0. Flash the router with the firmware and test that you have access to
+   it by wifi and wire.
+0. Get the hardware to mount the antenna.
+0. Find someone with installation experience to help you.
+0. Schedule installation when you have sun or light for 3 hours.
+
+Voici une liste de suggestions de points à vérifier avant d'installer une antenne:
+
+## Installation sur un toit
+
+* Combien d'étages a l'édifice?
+* Photos du toit comme tel, et du panorama (ex: [[nodes/deuxpi]], [[nodes/lacou]])
+* Est-ce qu'on peut installer sur le toit?
+* Y a-t-il des ancres sur le toit que l'on pourrait re-utiliser? Ex: un vieux récepteur Express Vu, un mât d'antenne télévision, etc.
+* Est-ce que l'on peut poser une nouvelle ancre? (sur la cheminée, sur le bord du toit, ..)
+* Est-ce que le propriétaire du bâtiment est d'accord avec l'installation? Si oui, à quel endroit?
+* Y a-t-il moyen de passer un câble ethernet pour alimenter l'antenne? Généralement cela implique de passer un câble ethernet à travers un cadre de fenêtre ou de porte. Souvent on peut enlever un vieux câble vidéotron, par exemple. Sinon percer un nouveau trou n'est pas compliqué.
+
+## Installation dans une fenêtre
+
+* À quel étage?
+* Y a-t-il une ligne de vue à partir de la fenêtre? Sinon, y a-t-il des voisins intéressés à poser une antenne sur leur toit?
+
+[[!img rl-antennes-exemples.jpg align="left" alt="Exemples d'antennes sur toits"]]
+
+Exemples: [[nodes/amman]] (soucoupe) /[[nodes/bgm-latakia]] (bullet omni, par dessus l'antenne TV), [[nodes/tarator]], [[nodes/boulette]], [[nodes/grace]].
+
+## Liens externes
+
+ * [[Learn Rooftop Basics|https://commotionwireless.net/docs/cck/building-mounting/learn-rooftop-basics/]]
+
+Hardware required
+=================
+
+To install an antenna on your roof, you will need at least the
+following hardware:
+
+ * mast & anchor: something to raise the antenna from the roof, if
+   only a little
+ * anchor holdings:
+   * concrete anchor bolts, if you drill it into concrete
+   * tripod with sandbags
+ * plastic cable holders to secure the cable
+ * exterior-grade network cable
+ * shielded RJ-45 connectors
+ * hose clamps
+ * [sealing tape](http://www.homedepot.ca/product/nashua-stretch-seal-silicone-sealing-tape-black-1in-x-10ft/959973), to seal the antenna connection with the router
+   (for Bullets)
+ * duct tape, for extreme hacks
+ * tie-wraps, same
+ * if using a 15 db omni antenna, two spacers to prevent the router
+   from touching the mast (see [[/user/elecnix]] for specifics)
+ * water: it gets hot up there
+ * power bar & 50' extension cord, esp. if drills are not battery-powered!
+
+And tools:
+
+ * screwdriver
+ * crimping tool
+ * cable tester
+ * pliers with a cutting edge
+ * drill and drill bits, hammer drill if you drill through concrete
+ * long drill bit (and drill) if you drill through wall or window
+   frame (at least 30cm)
+ * laptop that you know for sure can talk to the mesh, with a working battery
+
+Not absolutely necessary, but can be really useful:
+
+ * VHF radios to talk between the roof and ground, or between relays
+ * long measuring tape or spool to determine cable length
+ 
diff --git a/documentation/analyse/rl-antennes-exemples.jpg b/hardware/install/rl-antennes-exemples.jpg
similarity index 100%
rename from documentation/analyse/rl-antennes-exemples.jpg
rename to hardware/install/rl-antennes-exemples.jpg

diff --git a/nodes/bassnode2.mdwn b/nodes/bassnode2.mdwn
new file mode 100644
index 00000000..4ea21061
--- /dev/null
+++ b/nodes/bassnode2.mdwn
@@ -0,0 +1,62 @@
+[[!waypoint lat="45.5" lon="-73.666667" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
+
+# Technical details
+
+[[!ymlfront data="""
+MAC: (mac address here)
+IP: (pick one from [[policy/numbering]])
+IPv6: 
+"""]]
+
+hostname
+: bassnode
+
+Type
+: relay (can also be accesspoint, test, server)
+
+SSID
+: foo.relais.reseaulibre.ca (see [[policy/naming]])
+
+MAC address
+: MAC
+
+IPv6 address
+: IPv6
+
+IP address
+: IP
+
+Hardware
+: 
+
+Location
+: (where is this node physically installed?)
+
+Status
+: [[!taglink planned]] 
+
+Operator
+: [[/users/alice]]
+
+Links
+: (a wiki link to the nodes this node is connected with, will show up on the map, metadata in [[links]])
+
+# Services
+
+(you can document services accessible from this location)
+
+# Photos
+
+(You can upload images when you edit this page. Feel free to upload photos
+of your installation or of the panorama. It will help other people who may
+want to link with you.)
+
+[[!meta copyright="Copyright © 2011-2013 Your Name Here"]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|meta/gfdl]]."]]"""]]

diff --git a/nodes/bassnode.mdwn b/nodes/bassnode.mdwn
index 3082796f..fabf5c03 100644
--- a/nodes/bassnode.mdwn
+++ b/nodes/bassnode.mdwn
@@ -1,4 +1,4 @@
-[[!waypoint lat="45.3" lon="-73.31" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
+[[!waypoint lat="45.5" lon="-73.516667" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
 
 # Technical details
 

diff --git a/nodes/bassnode.mdwn b/nodes/bassnode.mdwn
index a454afb4..3082796f 100644
--- a/nodes/bassnode.mdwn
+++ b/nodes/bassnode.mdwn
@@ -1,4 +1,4 @@
-[[!waypoint lat="45.5" lon="-73.666667" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
+[[!waypoint lat="45.3" lon="-73.31" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
 
 # Technical details
 

diff --git a/nodes/bassnode.mdwn b/nodes/bassnode.mdwn
new file mode 100644
index 00000000..a454afb4
--- /dev/null
+++ b/nodes/bassnode.mdwn
@@ -0,0 +1,62 @@
+[[!waypoint lat="45.5" lon="-73.666667" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
+
+# Technical details
+
+[[!ymlfront data="""
+MAC: (mac address here)
+IP: (pick one from [[policy/numbering]])
+IPv6: 
+"""]]
+
+hostname
+: bassnode
+
+Type
+: relay
+
+SSID
+: foo.relais.reseaulibre.ca
+
+MAC address
+: MAC
+
+IPv6 address
+: IPv6
+
+IP address
+: IP
+
+Hardware
+: 
+
+Location
+: (where is this node physically installed?)
+
+Status
+: [[!taglink prospect]] (can also be up, down, planned, unknown)
+
+Operator
+: [[/users/alice]]
+
+Links
+: (a wiki link to the nodes this node is connected with, will show up on the map, metadata in [[links]])
+
+# Services
+
+(you can document services accessible from this location)
+
+# Photos
+
+(You can upload images when you edit this page. Feel free to upload photos
+of your installation or of the panorama. It will help other people who may
+want to link with you.)
+
+[[!meta copyright="Copyright © 2011-2013 Your Name Here"]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|meta/gfdl]]."]]"""]]

plastik is also down
diff --git a/nodes/plastik.mdwn b/nodes/plastik.mdwn
deleted file mode 100644
index 6a57dcc5..00000000
--- a/nodes/plastik.mdwn
+++ /dev/null
@@ -1,154 +0,0 @@
-Access point in my living room, same location as boulette or carton...
-
-The wifi here is in managed mode and operates as a bridge to the rest
-of the network.
-
-Those are the configuration steps followed:
-
- 1. [[documentation/flashing]] - with the generic Chaos Calmer OpenWRT firmware
- 2. disable the DHCP server on the LAN interface
- 3. disable IPv6 router advertisement (RA), DHCPv6 and NDP relay
- 3. make sure the IP of the bridge doesn't conflict with the main
-    router, either:
-    * assign a unique IP on the LAN interface 
-    * enable DHCP on the LAN interface (but then you'll have to guess
-       the IP)
- 4. connect the uplink on the LAN interface, the default OpenWRT
-    configuration bridges the wifi and LAN interface so your bridge is done
- 5. optionnally, configure WPA or some security on the access point to
-    please paranoid roommates
-
-This node is not part of the mesh anymore, but will eventually be
-connected to a router which will be, hopefully.
-
-[[!toc]]
-
-# Technical details
-
-[[!ymlfront data="""
-MAC: F8:D1:11:B7:5A:62
-IP: 192.168.31.1/24
-IPv6: fe80::fad1:11ff:feb7:5a62
-"""]]
-
-hostname
-: plastik
-
-MAC address
-: MAC
-
-
-IPv6 address
-: IPv6
-
-IP address
-: IP
-
-Software
-: OpenWRT attitude ajustment
-
-Hardware
-: TP-Link 1043D
-
-Power
-: ?
-
-Location
-: my office
-
-Azimuth
-: 360°
-
-Panorama
-: N/A
-
-Status
-: [[!taglink down]]
-
-Operator
-: [[users/anarcat]]
-
-Links
-: [[nodes/roadkiller]]
-
-DHCP and DNS
-------------
-
-    dhcp.@dnsmasq[0]=dnsmasq
-    dhcp.@dnsmasq[0].domainneeded='1'
-    dhcp.@dnsmasq[0].boguspriv='1'
-    dhcp.@dnsmasq[0].filterwin2k='0'
-    dhcp.@dnsmasq[0].localise_queries='1'
-    dhcp.@dnsmasq[0].rebind_protection='1'
-    dhcp.@dnsmasq[0].rebind_localhost='1'
-    dhcp.@dnsmasq[0].local='/lan/'
-    dhcp.@dnsmasq[0].domain='lan'
-    dhcp.@dnsmasq[0].expandhosts='1'
-    dhcp.@dnsmasq[0].nonegcache='0'
-    dhcp.@dnsmasq[0].authoritative='1'
-    dhcp.@dnsmasq[0].readethers='1'
-    dhcp.@dnsmasq[0].leasefile='/tmp/dhcp.leases'
-    dhcp.@dnsmasq[0].resolvfile='/tmp/resolv.conf.auto'
-    dhcp.@dnsmasq[0].localservice='1'
-    dhcp.lan=dhcp
-    dhcp.lan.interface='lan'
-    dhcp.lan.ignore='1'
-    dhcp.wan=dhcp
-    dhcp.wan.interface='wan'
-    dhcp.wan.ignore='1'
-    dhcp.odhcpd=odhcpd
-    dhcp.odhcpd.maindhcp='0'
-    dhcp.odhcpd.leasefile='/tmp/hosts/odhcpd'
-    dhcp.odhcpd.leasetrigger='/usr/sbin/odhcpd-update'
-
-Network config
---------------
-
-    network.globals=globals
-    network.globals.ula_prefix='fd66:beca:c32d::/48'
-    network.lan=interface
-    network.lan.ifname='eth0.1'
-    network.lan.force_link='1'
-    network.lan.type='bridge'
-    network.lan.proto='static'
-    network.lan.netmask='255.255.255.0'
-    network.lan.ip6assign='60'
-    network.lan.ipaddr='192.168.31.1'
-    network.wan=interface
-    network.wan.ifname='eth0.2'
-    network.wan.proto='dhcp'
-    network.wan6=interface
-    network.wan6.ifname='eth0.2'
-    network.wan6.proto='dhcpv6'
-
-IPv6 configuration
-------------------
-
-
-Radio configuration
--------------------
-    
-    wireless.radio0=wifi-device
-    wireless.radio0.type='mac80211'
-    wireless.radio0.channel='11'
-    wireless.radio0.hwmode='11g'
-    wireless.radio0.path='platform/ath9k'
-    wireless.radio0.htmode='HT20'
-    wireless.radio0.txpower='23'
-    wireless.radio0.country='US'
-    wireless.@wifi-iface[0]=wifi-iface
-    wireless.@wifi-iface[0].device='radio0'
-    wireless.@wifi-iface[0].network='lan'
-    wireless.@wifi-iface[0].mode='ap'
-    wireless.@wifi-iface[0].encryption='none'
-    wireless.@wifi-iface[0].ssid='CrapN7'
-
-[[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|meta/gfdl]]."]]"""]]

those really are just prospects too
diff --git a/nodes/batiment7.mdwn b/nodes/batiment7.mdwn
index 6cf33764..98ab5193 100644
--- a/nodes/batiment7.mdwn
+++ b/nodes/batiment7.mdwn
@@ -47,7 +47,7 @@ Panorama
 : N/A
 
 Status
-: [[!taglink planned]]
+: [[!taglink prospect]]
 
 Operator
 : [[users/anarcat]], [[users/martn]]
diff --git a/nodes/lachoppe.mdwn b/nodes/lachoppe.mdwn
index dea94c31..149442d6 100644
--- a/nodes/lachoppe.mdwn
+++ b/nodes/lachoppe.mdwn
@@ -9,7 +9,7 @@ Need to ask too.
  * Hardware:
  * Power:
  * Location:
- * Status: [[!taglink planned]]
+ * Status: [[!taglink prospect]]
  * Links: 
  * Azimuth:
  * Panorama:

plantpeople are not there anymore, afaik, not sure what happened to the hw
diff --git a/nodes/plantpeople.mdwn b/nodes/plantpeople.mdwn
index ee15f9fd..b561b90f 100644
--- a/nodes/plantpeople.mdwn
+++ b/nodes/plantpeople.mdwn
@@ -4,7 +4,7 @@ This node is still being built, for now it's sitting in a window but
 we are trying to figure out how to bring it to the top, which is hard
 because we need a very tall ladder.
 
-I (anarcat0 still own the hardware, but plantpeople are looking at
+I (anarcat) still own the hardware, but plantpeople are looking at
 finding money to buy it.
 
 # Technical details
@@ -46,7 +46,7 @@ Panorama
 : N/A
 
 Status
-: [[!taglink down]]
+: [[!taglink prospect]]
 
 Operator
 : [[users/anarcat]]

roadkiller retired
diff --git a/nodes/roadkiller.mdwn b/nodes/roadkiller.mdwn
deleted file mode 100644
index 33ebfc46..00000000
--- a/nodes/roadkiller.mdwn
+++ /dev/null
@@ -1,71 +0,0 @@
-This is my home router, which is not part of the BATMAN mesh but is
-still in the mesh at the IP level because it is connected to [[boulette]]
-
-This is a public internet gateway. The access is severly firewalled, and
-access will be completely removed if abused.
-
-[[!ymlfront data="""
-IP: 
-- 172.16.0.1/32
-- 72.0.72.144/32
-IPv6:
-- fd64:2c08:9fa7::1/128
-- 2001:1928:1:9::1/64
-"""]]
-
- * MAC address: MAC
- * IPv6 address: IPv6
- * IP address: IP
- * Software: FreeBSD 8.2
- * Hardware: Soekris
- * Power: N/A
- * Location: [[anarcat]]
- * Status: [[!taglink down]]
- * Links: [[plastik]]
- * Azimuth: N/A
- * Panorama: N/A
- * Operator: [[users/anarcat]]
-
-Babel configuration
--------------------
-
-[[!format txt """
-# mesh IPv6
-redistribute local ip fd64:2c08:9fa7:1::1/128 metric 128
-redistribute local ip fd64:2c08:9fa7::1/128 metric 128
-redistribute ip fd64:2c08:9fa7::/48 ge 48 metric 128
-# mesh IPv4
-redistribute local ip 172.16.0.1/32 metric 128
-redistribute ip 172.16.0.0/12 ge 12 metric 128
-# bgm - not necessary?
-redistribute ip 2607:f2c0:f00f:2900::/56 metric 128
-# public IPv6
-redistribute local ip 2001:1928:1:9::/64 metric 128
-# public IPv4
-redistribute local ip 72.0.72.144/32 metric 128
-# default route
-redistribute ip 0.0.0.0/0 le 0 metric 128
-# IPv6 default route
-redistribute ip ::/4 metric 128
-# do not redistribute local routes that are not explicitely allowed
-redistribute local deny
-# do not redistribute arbitrary routes from the mesh
-redistribute deny
-# allow mesh IPs in
-in ip fd64:2c08:9fa7::/48 ge 48 metric 128
-in ip 172.16.0.0/12 ge 12 metric 128
-# bgm
-in ip 2607:f2c0:f00f:2900::/56 ge 56 metric 128
-# deny anything from the mesh by default
-in deny
-"""]]
-
-[[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|meta/gfdl]]."]]"""]]

dame7 n'est plus depuis belle lurette
diff --git a/nodes/dame7.mdwn b/nodes/dame7.mdwn
deleted file mode 100644
index 27f92635..00000000
--- a/nodes/dame7.mdwn
+++ /dev/null
@@ -1,271 +0,0 @@
-[[!waypoint lat="45.48065" lon="-73.55155" embed hidden width="400px" height="400px" right desc="A node-gw in front of node batiment7"]]
-
-Neighbor of [[batiment7]].
-
-
-dame7 reçoit le signal de [[batiment7]] et le transmet vers la passerelle de la dame qui héberge l'antenne puis vers l'internet.
-L'objectif est de streamer un flux video dans le Batiment 7 vers l'internet.dame7 est donc un client dhcp puisqu'elle doit recevoir son IP sur br-lan de la passerelle de la dame qui héberge l'antenne.
-
-
-/!\ **Suite à des problèmes de DNS et comme la mission de cette antenne était principalement de transmettre un signal de [[batiment7]], j'ai du reflasher l'antenne avec son OS proprio d'origine.  Dame7 n'est donc plus du réseau.**
-
-# Technical details
-
-[[!ymlfront data="""
-MAC: 00:15:6D:AD:6B:8B
-IP: 172.16.2.2
-IPv6: N/A
-"""]]
-
-hostname
-: dame7
-
-MAC address
-: MAC
-
-IPv6 address
-: IPv6
-
-IP address
-: IP
-
-Software
-: OpenWRT Backfire
-
-Hardware
-: Nanostation 2
-
-Power
-: ?
-
-Location
-: neighbor of [[batiment7]]
-
-Azimuth
-: 60°
-
-Panorama
-: N/A
-
-Status
-: [[!taglink down]]
-
-Operator
-: [[users/anarcat]], [[users/martn]]
-
-Links
-: (a wiki link to the nodes this node is connected with, will show up on the map, metadata in [[links]])
-
-
-Babel Configuration
--------------------
-
-    babeld.@general[0]=general
-    babeld.@general[0].port=6696
-    babeld.wlan=interface
-    babeld.wlan.ignore=true
-    babeld.lan=interface
-    babeld.lan.ignore=true
-    babeld.@filter[0]=filter
-    babeld.@filter[0].ignore=true
-    babeld.@filter[0].type=redistribute
-    babeld.@filter[0].ip=0.0.0.0/0
-    babeld.@filter[0].le=0
-    babeld.@filter[0].proto=3
-    babeld.@filter[0].action=metric 128
-
-Network config
---------------
-
-    network.loopback=interface
-    network.loopback.ifname=lo
-    network.loopback.proto=static
-    network.loopback.ipaddr=127.0.0.1
-    network.loopback.netmask=255.0.0.0
-    network.lan=interface
-    network.lan.ifname=eth0
-    network.lan.proto=static
-    network.lan.ipaddr=192.168.1.1
-    network.lan.netmask=255.255.255.0
-    network.mesh=interface
-    network.mesh.proto=static
-    network.mesh.netmask=255.255.255.255
-    network.mesh.ipaddr=172.16.2.2
-
-
-Radio configuration
--------------------
-    
-    wireless.wifi0=wifi-device
-    wireless.wifi0.type=atheros
-    wireless.wifi0.antenna=auto
-    wireless.wifi0.channel=1
-    wireless.@wifi-iface[0]=wifi-iface
-    wireless.@wifi-iface[0].device=wifi0
-    wireless.@wifi-iface[0].encryption=none
-    wireless.@wifi-iface[0].mode=adhoc
-    wireless.@wifi-iface[0].ssid=relais.reseaulibre.ca
-    wireless.@wifi-iface[0].bssid=02:CA:FF:EE:BA:BE
-    wireless.@wifi-iface[0].network=mesh
-
-
-
-
-# Notes d'installation
-
-
-Reflashing de dame7 avec openwrt:backfire
------------------------------------------
-
-    atftp --trace --option "timeout 1" --tftp-timeout 1 --option "mode octet" --put --local-file openwrt-atheros-ubnt2-squashfs.bin   192.168.1.20 
-
-après l'avoir flashé, il prend 192.168.1.1
-
-    telnet 192.168.1.1
-    passwd
-
-root@OpenWrt:/# 
-
-    uci set system.@system[0].hostname=dame7
-    uci delete wireless.wifi0.disabled
-    uci delete wireless.@wifi-iface[0].network
-    uci set wireless.wifi0.channel=1
-    uci set wireless.@wifi-iface[0].mode=adhoc
-    uci set wireless.@wifi-iface[0].ssid='relais.reseaulibre.ca'
-    uci set wireless.@wifi-iface[0].bssid='02:CA:FF:EE:BA:BE'
-    uci commit
-    reboot & exit
-
-
-Installation des paquets
-------------------------
- * kmod-ipv6
- * babeld
-Donc un accès à internet.
-Pour accès à internet, ça lui prend une adresse sur 192.168.0.255...
-root@dame7:~# 
-
-    ifconfig  br-lan 192.168.0.42  netmask 255.255.255.0 & exit
-
-root@dame7:~#
-
-    route add default gw 192.168.0.1
-    vim /etc/resolv.conf
-    >> nameserver 192.168.0.1
-
-(J'ai aussi enlever 127.0.0.1, ça fuckait le dns)
-root@dame7:~# 
-
-    opkg update
-    opkg install ip kmod-ipv6 babeld
-
-
-Configuration du parefeu et des zones
--------------------------------------
-
-par luci-web on va créer la zone 'mesh' 
-/admin/network/network/mesh
-
-    protocole: static
-    interface: ath0 (Wireless Network: Ad-Hoc "relais.reseaulibre.ca")
-    firewall-zone: mesh
-    ipv4 addr: 172.168.2.2
-    ipv4 netmask: 255.255.255.255
-
-save & apply
-(elle pert son ip 192.168.0.42 et retourne sur 192.168.1.1)
-
-
-/admin/network/network/lan >> physical settings
-on enlève le bridge du lan
-/admin/network/network/lan >> firewall
-on assigne  lan à wan
-            mesh à lan
-Essentiellement, ce qui arrive de batiment7 par le mesh peut sortir vers le wan (vers le routeur chez la dame), mais ce qui arrive de chez la dame ne va pas vers le mesh.
-On pourrait éventuellement rafiner les règles pour éviter que quelqu'un accède à l'internet par le routeur de la dame en passant par le mesh.
-
-    firewall.cfg1692bd=rule
-    firewall.cfg1692bd.target=ACCEPT
-
-    firewall.cfg02f50e
-    firewall.cfg02f50e.drop_invalid=1
-
-    firewall.cfg06a808
-    firewall.cfg06a808.network=wan lan

(Diff truncated)
would still be nice to have a node at kt
diff --git a/nodes/koumbit-outremont.mdwn b/nodes/koumbit-outremont.mdwn
index fcdd9e22..298cccbf 100644
--- a/nodes/koumbit-outremont.mdwn
+++ b/nodes/koumbit-outremont.mdwn
@@ -39,7 +39,7 @@ Panorama
 : N/A
 
 Status
-: [[!taglink down]]
+: [[!taglink planned]]
 
 Operator
 : [[users/anarcat]]

carton has been retired
diff --git a/nodes/carton.mdwn b/nodes/carton.mdwn
deleted file mode 100644
index b211497b..00000000
--- a/nodes/carton.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-Test node for [[anarcat]], deployed below [[boulette]] to provide access to the local community.
-
----
-
-    MAC: 00:1C:10:22:02:AE
-    IP: 172.16.1.1
-    IPv6: fd64:2c08:9fa7:1::2/64
-
----
-
- * Software: OpenWRT trunk
- * Hardware: Links WRT54G
- * Power: N/A
- * Location: in the window facing St-Denis street
- * Status: [[!taglink down]]
- * Links: [[boulette]]
- * Azimuth: 360°
- * Panorama: N/A
- * Operator: [[users/anarcat]]
-
-[[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|meta/gfdl]]."]]"""]]

they were evicted a long time ago
diff --git a/nodes/moreau.mdwn b/nodes/moreau.mdwn
deleted file mode 100644
index 63c8854b..00000000
--- a/nodes/moreau.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-[[!waypoint lat="45.53991" lon="-73.54866" embed hidden width="400px" height="400px" right desc="Window node pointing downtown"]]
-
-This is a potential spot, although I have yet to confirm with the tenants of the space, they have a very good view from their window on the 4th (5th?) floor of basically the whole city: downtown all the way up to rosemont...
-
- * MAC address: TBD
- * IP address: TBD
- * IPv6 address: TBD
- * Software: TBD
- * Hardware: TBD
- * Power: TBD
- * Location: espace coopératif sur moreau près de ontario
- * Status: [[!taglink planned]]
- * Links: none yet
- * Azimuth: west
- * Panorama: N/A
- * Operator: [[users/anarcat]]?
-
-[[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|meta/gfdl]]."]]"""]]

update my status
diff --git a/documentation/services.mdwn b/documentation/services.mdwn
index 8801e8a4..4513f326 100644
--- a/documentation/services.mdwn
+++ b/documentation/services.mdwn
@@ -9,12 +9,13 @@ Voir aussi la page: [[idées|Idees]].
 # Services présentement disponibles / Currently available services
 
  * Via [[nodes/roadkiller]]:
-  * DNS server at `172.16.0.1` / `fd64:2c08:9fa7:1::1` (`roadkiller.anarcat.ath.cx`)
+  * <del>DNS server at `172.16.0.1` / `fd64:2c08:9fa7:1::1`
+    (`roadkiller.anarcat.ath.cx`)</del> - down
   * <http://wiki.reseaulibre.ca/> - this wiki, should be running on
-    `marcos.orangeseeds.org` (`2001:1928:1:9::1`)
+    `marcos.orangeseeds.org` - not directly on the mesh anymore
   * this wiki is also available through git, see [[meta]]
-  * <http://anarcat.ath.cx/> - various services, also available through
-    `marcos`
+  * <http://anarc.at/> - various services, also available through
+    `marcos` - not directly on the mesh anymore
  * Via [[nodes/deuxpi]]:
   * Game Server (NetHack: `telnet nethack.deuxpi.ca`, Tetrinet: `tetrinet.deuxpi.ca`)
   * Media Server <http://media.deuxpi.ca>

irc.bidon.ca down
diff --git a/documentation/services.mdwn b/documentation/services.mdwn
index fc79ea91..8801e8a4 100644
--- a/documentation/services.mdwn
+++ b/documentation/services.mdwn
@@ -24,7 +24,6 @@ Voir aussi la page: [[idées|Idees]].
  * Via [[nodes/bgm-latakia]], [[nodes/tarator]], [[nodes/pointe03]]:
   * Forum web: <https://forum.bidon.ca> (accessible par Réseau libre seulement)
   * Partage de fichiers privés/encryptés: <https://transit.bidon.ca>  (accessible par Réseau libre seulement)
-  * Client web IRC pour accéder au canal de discussion de Réseau libre <https://irc.bidon.ca>
 
 # Annoncer un nouveau service / Announcing a new service on the network
 

fix irc links
diff --git a/index.mdwn b/index.mdwn
index ac59e98a..ab29fa77 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -59,7 +59,7 @@ et de partage d'Internet à Montréal</p>
 <li><a href="https://listes.koumbit.net/cgi-bin/mailman/listinfo/nouvelles-reseaulibre.ca" class="button">Liste d'annonces</a></li>
 </ul>
 <ul class="actions">
-<li><a href="https://irc.bidon.ca/" class="button">Canal <abbr title="Internet Relay Chat - Clavardage en direct">IRC</abbr></a></li>
+<li><a href="https://webchat.freenode.net/?channels=reseaulibre/" class="button">Canal <abbr title="Internet Relay Chat - Clavardage en direct">IRC</abbr></a></li>
 <li><a href="/meetings/" class="button">Rencontres</a></li>
 </ul>
 <ul class="actions">

retirer un lien briser un le roadmap
diff --git a/index.mdwn b/index.mdwn
index d6076644..ac59e98a 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -69,16 +69,12 @@ et de partage d'Internet à Montréal</p>
 <h3>Général</h3>
 <!-- <p>Comment participer dans le projet Réseau Libre?</p> -->
 <ul class="actions">
-<li><a href="/donate/" class="button">Donner matériel</a></li>
-<li><a href="#" class="button">Partenariat</a></li>
-</ul>
-<ul class="actions">
 <li><a href="/FAQ/" class="button">FAQ</a></li>
-<li><a href="/documentation/" class="button">Documentation</a></li>
+<li><a href="/donate/" class="button">Donner matériel</a></li>
 </ul>
 <ul class="actions">
-<li><a href="/roadmap/" class="button">Roadmap</a></li>
 <li><a href="/ikiwiki.cgi?map=map&do=osm&zoom=12&lat=45.5227&lon=-73.59554&layers=0B0TT" class="button">Carte</a></li>
+<li><a href="/documentation/" class="button">Documentation</a></li>
 </ul>
 </footer>
 

fix my contact info
diff --git a/users/anarcat.mdwn b/users/anarcat.mdwn
index a7a83ec3..ab7560c5 100644
--- a/users/anarcat.mdwn
+++ b/users/anarcat.mdwn
@@ -1,6 +1,10 @@
 [[!img folipon.jpg align="right" size="" alt="picture of me"]]
 
-See <https://wiki.koumbit.net/TheAnarcat>. I can be easily contact on [identica](http://identi.ca/anarcat) and elsewhere (email @here works). 
+See [my homepage](https://anarc.at/). I can be contacted over email
+(`anarcat@` this domain) or
+on
+[irc.freenode.net](https://webchat.freenode.net/?channels=reseaulibre)
+as `anarcat`.
 
 [[!toc levels=2]]
 

remove broken fortune line
diff --git a/users/anarcat.mdwn b/users/anarcat.mdwn
index e20b03d3..a7a83ec3 100644
--- a/users/anarcat.mdwn
+++ b/users/anarcat.mdwn
@@ -2,8 +2,6 @@
 
 See <https://wiki.koumbit.net/TheAnarcat>. I can be easily contact on [identica](http://identi.ca/anarcat) and elsewhere (email @here works). 
 
-[[!fortune]]
-
 [[!toc levels=2]]
 
 # IP allocations

irc.bidon.ca down
diff --git a/participer.mdwn b/participer.mdwn
index d1bffd35..ded5cf72 100644
--- a/participer.mdwn
+++ b/participer.mdwn
@@ -6,7 +6,7 @@ Réseau Libre est un réseau ouvert.  Tout le monde peut s'impliquer et plus il
 * S'inscrire sur la [[liste de discussion|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-reseaulibre.ca]] ou la [[liste d'annonces|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nouvelles-reseaulibre.ca]].
 * [[S'inscrire comme relais|Nodes]] (node) potentiel dans le wiki, voir les relais à proximité avec qui il serait possible de connecter.
 * Participer aux [[rencontres techniques et sociales|meetings]].
-* Discuter avec les membres sur le chat irc [[#reseaulibre|https://webchat.freenode.net/?channels=reseaulibre]] sur freenode.net ou <https://irc.bidon.ca> 
+* Discuter avec les membres sur le chat irc [[#reseaulibre|https://webchat.freenode.net/?channels=reseaulibre]] sur freenode.net
 * Accéder aux [[documentation/services]] disponibles sur le Réseau.
 * Installer un relais ou un point d'accès en suivant la [[documentation]].
 * Voir la liste des [[tâches à faire|Todo]].

retirer le lien vers le roadmap
le plan d'action n'a pas été adopté en groupe et n'est certainement
plus à jour...
diff --git a/participer.mdwn b/participer.mdwn
index 000790b3..d1bffd35 100644
--- a/participer.mdwn
+++ b/participer.mdwn
@@ -7,7 +7,6 @@ Réseau Libre est un réseau ouvert.  Tout le monde peut s'impliquer et plus il
 * [[S'inscrire comme relais|Nodes]] (node) potentiel dans le wiki, voir les relais à proximité avec qui il serait possible de connecter.
 * Participer aux [[rencontres techniques et sociales|meetings]].
 * Discuter avec les membres sur le chat irc [[#reseaulibre|https://webchat.freenode.net/?channels=reseaulibre]] sur freenode.net ou <https://irc.bidon.ca> 
-* Prendre connaissance du [[plan d'action 2015-2016|roadmap]].
 * Accéder aux [[documentation/services]] disponibles sur le Réseau.
 * Installer un relais ou un point d'accès en suivant la [[documentation]].
 * Voir la liste des [[tâches à faire|Todo]].

mailing list was renamed
diff --git a/FAQ.mdwn b/FAQ.mdwn
index 543d02cb..9d65f3b4 100644
--- a/FAQ.mdwn
+++ b/FAQ.mdwn
@@ -86,7 +86,7 @@ Si l'accès est fourni par quelqu'un que vous ne connaissez pas, celui-ci peut 
 
 Si un accès internet est disponible, vous pouvez faire tout ce qui peut se faire sur le web!
 
-Sinon, pas grand chose.  Le réseau est encore expérimental.  À terme, on devrait avoir une page de bienvenue sur le réseau avec une liste des services offerts.  Pour l'instant, suivez la [[liste de discussion|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-lists.openisp.ca]] pour vous tenir informés.
+Sinon, pas grand chose.  Le réseau est encore expérimental.  À terme, on devrait avoir une page de bienvenue sur le réseau avec une liste des services offerts.  Pour l'instant, suivez la [[liste de discussion|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-reseaulibre.ca]] pour vous tenir informés.
 
 ##C'est pas comme vraiment geek ça ?##
 
diff --git a/hardware/achats/2013-02-achat.mdwn b/hardware/achats/2013-02-achat.mdwn
index d233f252..f5f64596 100644
--- a/hardware/achats/2013-02-achat.mdwn
+++ b/hardware/achats/2013-02-achat.mdwn
@@ -1,6 +1,6 @@
 # Achat collectif
 
-Si vous n'êtes pas sur la listes de discussion [[nodes@|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-lists.openisp.ca]], mentionnez comment vous rejoindre.
+Si vous n'êtes pas sur la listes de discussion [[nodes@|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-reseaulibre.ca]], mentionnez comment vous rejoindre.
 
 * [Bullet M2HP Ti][] + [antenne omni 15 dbi][] + [injecteur PoE 24V 1A w/RESET][]; (votre nom ici)
 * [Bullet M2HP][] + [antenne omni 15 dbi][] + [injecteur PoE 24V 1A w/RESET][]; (votre nom ici)
diff --git a/index.mdwn b/index.mdwn
index 84bce961..d6076644 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -55,7 +55,7 @@ et de partage d'Internet à Montréal</p>
 <li><a href="https://www.loomio.org/g/KT1yaFu0/reseau-libre" class="button">Forum</a></li>
 </ul>
 <ul class="actions">
-<li><a href="https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-lists.openisp.ca" class="button">Liste de discussions</a></li>
+<li><a href="https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-reseaulibre.ca" class="button">Liste de discussions</a></li>
 <li><a href="https://listes.koumbit.net/cgi-bin/mailman/listinfo/nouvelles-reseaulibre.ca" class="button">Liste d'annonces</a></li>
 </ul>
 <ul class="actions">
diff --git a/index/en.mdwn b/index/en.mdwn
index 236ab985..e3991230 100644
--- a/index/en.mdwn
+++ b/index/en.mdwn
@@ -12,7 +12,7 @@ Interested?
 <li class="reseaulibre-list-actions-faq"><a class="reseaulibre-link-action" href="/FAQ">Frequently asked questions</a></li>
 </ul>
 
-Le réseau s'organise depuis le début de 2012. Nous avons [[!pagecount pages="nodes/* and !*/*/* and !*/discussion and tagged(up)"]] [[relais en opération|nodes]]. Nous avons aussi des [[présentations vidéo|videos]], une [[liste de discussion|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-lists.openisp.ca]] et vous pouvez discuter en ligne avec nous sur notre canal IRC [#reseaulibre](http://webchat.freenode.net/?channels=reseaulibre) sur le réseau Freenode.
+Le réseau s'organise depuis le début de 2012. Nous avons [[!pagecount pages="nodes/* and !*/*/* and !*/discussion and tagged(up)"]] [[relais en opération|nodes]]. Nous avons aussi des [[présentations vidéo|videos]], une [[liste de discussion|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-reseaulibre.ca]] et vous pouvez discuter en ligne avec nous sur notre canal IRC [#reseaulibre](http://webchat.freenode.net/?channels=reseaulibre) sur le réseau Freenode.
 
 <div class="reseaulibre-subscribe-box">
   <div class="reseaulibre-subscribe-box-description">Pour recevoir les annonces des événements à venir:</div>
diff --git a/meetings.mdwn b/meetings.mdwn
index 602af3c4..fa70ed7a 100644
--- a/meetings.mdwn
+++ b/meetings.mdwn
@@ -30,4 +30,4 @@ Pour organiser une rencontre
  1. Créer une page avec le formulaire ci-haut pour détailler le pourquoi de la rencontre
  1. Poster un *Doodle* au moins 1 semaine à l'avance, afin de déterminer une date (avec [Dudle](https://dudle.inf.tu-dresden.de/), [Framadate](http://www.framadate.org/infos_sondage.php) ou un outil similaire)
  2. Si possible, établir un lieu près de la majeure partie des répondants, sinon établir le lieu en fonction de la tâche à accomplir
- 3. Après quelques jours de délibération sur le *Doodle*, annoncer la date sur la [liste de discussion](https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-lists.openisp.ca) et possiblement sur la [liste d'annonces](https://listes.koumbit.net/cgi-bin/mailman/listinfo/nouvelles-reseaulibre.ca), indiquer également l'évènement sur [l'agenda du libre](http://www.agendadulibre.qc.ca/)
+ 3. Après quelques jours de délibération sur le *Doodle*, annoncer la date sur la [liste de discussion](https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-reseaulibre.ca) et possiblement sur la [liste d'annonces](https://listes.koumbit.net/cgi-bin/mailman/listinfo/nouvelles-reseaulibre.ca), indiquer également l'évènement sur [l'agenda du libre](http://www.agendadulibre.qc.ca/)
diff --git a/nouvelles/2012-12_Nouvelles.mdwn b/nouvelles/2012-12_Nouvelles.mdwn
index 225e552a..a22fed3c 100644
--- a/nouvelles/2012-12_Nouvelles.mdwn
+++ b/nouvelles/2012-12_Nouvelles.mdwn
@@ -26,7 +26,7 @@ La [commande de décembre][4] est terminée! Le prochain achat de groupe sera pr
 
  [4]: http://wiki.reseaulibre.ca/hardware/achats/2012-12-nanostation/
  [5]: http://wiki.reseaulibre.ca/hardware/achats/2013-02-achat/
- [6]: https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-lists.openisp.ca
+ [6]: https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-reseaulibre.ca
 
 Présentation IPv6 et retour de Barcelone: un succès!
 ====================================================
diff --git a/nouvelles/liste_de_nouvelles_et_autres_nouvelles__33__.mdwn b/nouvelles/liste_de_nouvelles_et_autres_nouvelles__33__.mdwn
index cb48f2e9..914d5da1 100644
--- a/nouvelles/liste_de_nouvelles_et_autres_nouvelles__33__.mdwn
+++ b/nouvelles/liste_de_nouvelles_et_autres_nouvelles__33__.mdwn
@@ -15,7 +15,7 @@ La liste est à bas volume (~1-2 courriels par mois) et vise à tenir les gens i
 
 On peut s'inscrire sur la liste sur cette page: <https://listes.koumbit.net/cgi-bin/mailman/listinfo/nouvelles-reseaulibre.ca>. Les opérateurs peuvent envoyer un courriel à nouvelles@reseaulibre.ca afin de publier une nouvelle. Une modération sera nécessaire pour les premiers envois, et seulement les envois rédigés sur le wiki préalablement seront approuvés.
 
-La liste de discussion `nodes@lists.openisp.ca` demeure l'endroit privilégié pour les conversations régulières de opérateurs.
+La liste de discussion `nodes@reseaulibre.ca` demeure l'endroit privilégié pour les conversations régulières de opérateurs.
 
 Important: changement au BSSID
 ------------------------------
diff --git a/participer.mdwn b/participer.mdwn
index 6166ebde..000790b3 100644
--- a/participer.mdwn
+++ b/participer.mdwn
@@ -3,7 +3,7 @@
 Réseau Libre est un réseau ouvert.  Tout le monde peut s'impliquer et plus il y aura de monde dans le réseau, plus ça deviendra intéressant.  
 
 * D'abord prendre connaissance de la [[foire aux questions|FAQ]].
-* S'inscrire sur la [[liste de discussion|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-lists.openisp.ca]] ou la [[liste d'annonces|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nouvelles-reseaulibre.ca]].
+* S'inscrire sur la [[liste de discussion|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nodes-reseaulibre.ca]] ou la [[liste d'annonces|https://listes.koumbit.net/cgi-bin/mailman/listinfo/nouvelles-reseaulibre.ca]].
 * [[S'inscrire comme relais|Nodes]] (node) potentiel dans le wiki, voir les relais à proximité avec qui il serait possible de connecter.
 * Participer aux [[rencontres techniques et sociales|meetings]].
 * Discuter avec les membres sur le chat irc [[#reseaulibre|https://webchat.freenode.net/?channels=reseaulibre]] sur freenode.net ou <https://irc.bidon.ca> 
diff --git a/policy/naming/discussion.mdwn b/policy/naming/discussion.mdwn
index aaabbf6f..94312728 100644
--- a/policy/naming/discussion.mdwn
+++ b/policy/naming/discussion.mdwn
@@ -128,7 +128,7 @@ opérateurs peuvent choisir d'autres noms.
 Débat sur le nom du projet
 ==========================
 
-Il y a présentement un débat sur la mailing list au sujet du nom du réseau ad-hoc. Le email de départ est [ici](https://listes.koumbit.net/cgi-bin/mailman/private/nodes-lists.openisp.ca/2012-April/000166.html).
+Il y a présentement un débat sur la mailing list au sujet du nom du réseau ad-hoc. Le email de départ est [ici](https://listes.koumbit.net/cgi-bin/mailman/private/nodes-reseaulibre.ca/2012-April/000166.html).
 
 Il semblerait y avoir 3 questions à résoudre:
 

link to flashing again for default procedure
diff --git a/FAQ.mdwn b/FAQ.mdwn
index fac87584..543d02cb 100644
--- a/FAQ.mdwn
+++ b/FAQ.mdwn
@@ -112,7 +112,7 @@ C'est préférable d'être capable de voir l'autre noeud. Il est /possible/ de f
 
 ## Comment je peux flasher mon router XYZ?
 
-Voir la page [[guides/install+node+facile]].
+Voir la page [[documentation/flashing]] et suivantes.
 
 ## J'ai perdu mon mot de passe!
 

remettre un lien vers la config IPv4 normale
diff --git a/documentation.mdwn b/documentation.mdwn
index 94344d22..847dd8ed 100644
--- a/documentation.mdwn
+++ b/documentation.mdwn
@@ -27,9 +27,9 @@ Pour configurer un relais:
 2. [[Préparer l'installation physique|analyse]] - suggestions de points à évaluer (photos du toit, etc)
 3. [[Se procurer le matériel nécessaire|hardware]]
 1. [[Installation de OpenWRT|flashing/]] [[!trailitem flashing]]
-2. [[Configurer le mode réseau adhoc|ad-hoc]] [[!trailitem ad-hoc]]
-3. [[Configurer IPv6|ipv6]] [[!trailitem ipv6]]
-4. [[Configurer Babel|babel/]] [[!trailitem babel]]
+2. [[Configuration le mode réseau adhoc|ad-hoc]] [[!trailitem ad-hoc]]
+3. [[Configuration IP|ip]] / [[IPv6]] [[!trailitem ip]] [[!trailitem ipv6]]
+4. [[Configuration Babel|babel/]] [[!trailitem babel]]
 
 NB: on peut configurer un relais et un point d'accès sur le même
 appareil. Ce sera plus lent, mais pour démarrer, ça peut éviter

retirer le guide d'installation facile qui n'est plus à jour
diff --git a/documentation.mdwn b/documentation.mdwn
index 735590c0..94344d22 100644
--- a/documentation.mdwn
+++ b/documentation.mdwn
@@ -26,16 +26,18 @@ Pour configurer un relais:
 1. [[Identifier votre emplacement sur la carte|nodes]] - même si vous en êtes qu'à l'étape de projet, ça encouragera vos voisins à participer également.
 2. [[Préparer l'installation physique|analyse]] - suggestions de points à évaluer (photos du toit, etc)
 3. [[Se procurer le matériel nécessaire|hardware]]
-1. [[Installation et configuration logicielle d'un relais|guides/install+node+facile]]
-
-Documentation plus technique et détaillée, mais possiblement pas à jour:
-
 1. [[Installation de OpenWRT|flashing/]] [[!trailitem flashing]]
 2. [[Configurer le mode réseau adhoc|ad-hoc]] [[!trailitem ad-hoc]]
 3. [[Configurer IPv6|ipv6]] [[!trailitem ipv6]]
 4. [[Configurer Babel|babel/]] [[!trailitem babel]]
 
-NB: on peut configurer un relais et un point d'accès sur le même appareil. Ce sera plus lent, mais pour démarrer, ça peut éviter d'installer deux appareils sur le toit.
+NB: on peut configurer un relais et un point d'accès sur le même
+appareil. Ce sera plus lent, mais pour démarrer, ça peut éviter
+d'installer deux appareils sur le toit. Une image basée sur Commotion
+était auparavant construite par le projet pour supporter notre
+protocole "Babel", mais les images ne sont plus à jour
+depuis 2014. Voir [[guides/install+node+facile/]] pour cette
+documentation.
 
 # Développement
 

warn this is out of date
diff --git a/guides/install+node+facile.mdwn b/guides/install+node+facile.mdwn
index 2a7c8667..0d19f30e 100644
--- a/guides/install+node+facile.mdwn
+++ b/guides/install+node+facile.mdwn
@@ -1,3 +1,9 @@
+[[!caution """This documentation is out of date: the firmware images were last
+built in 2014 and may contain numerous security holes. It is now
+recommended that you configure images from scratch using base OpenWRT
+or LEDE images using the detailed step by step guide in
+[[documentation/flashing]]."""]]
+
 [[!toc levels=2]]
 
 # Flash the device

restore lost antenna history
diff --git a/hardware/antennes.mdwn b/hardware/antennes.mdwn
index 6f83f4a2..9c0699d8 100644
--- a/hardware/antennes.mdwn
+++ b/hardware/antennes.mdwn
@@ -1,7 +1,20 @@
-[[!meta title="Supports d'antennes"]]
+[[!meta title="Antennes et supports"]]
 
 [[!toc levels=3]]
 
+## Antennes
+
+Recommandée avec le [[Bullet M2HP|hardware/routers/#index2h3]]:
+ * TP-Link 12 dBi ([[Addison|https://addison-electronique.com/antenne-exterieure-12dbi-pour-reseau-sans-fil.html]], [[Amazon|http://www.amazon.ca/gp/product/B003CFATO2]])
+
+For laptops, this looks like a nice alternative to the "Alfa" I
+currently
+own:
+<https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-w-external-antenna-gnu-linux-tpe-n150usbl>.
+
+We mostly use omni antennas for the "bullet" devices we often use, but
+I'm not sure how do document this.
+
 ## Supports
 
 La plupart des antennes et des routeurs/antennes sont munies de fixation pour tuyau de 1" à 2".

there is no actual link between the two blocks of course
diff --git a/nodes/easternblock.mdwn b/nodes/easternblock.mdwn
index 565a3ac7..de930c37 100644
--- a/nodes/easternblock.mdwn
+++ b/nodes/easternblock.mdwn
@@ -3,7 +3,7 @@
 Eastern Block has showed interest in having a node on their roof. They
 can find roof access.
 
-The hardware for this node was re-assigned to [[westernblock]] on 2017-07-04.
+The hardware for this node was re-assigned to westernblock on 2017-07-04.
 
 # Technical details
 
diff --git a/nodes/westernblock.mdwn b/nodes/westernblock.mdwn
index 6fc7511a..3d3cc499 100644
--- a/nodes/westernblock.mdwn
+++ b/nodes/westernblock.mdwn
@@ -1,7 +1,7 @@
 [[!waypoint lat="45.47849" lon="-73.62376" embed hidden width="400px" height="400px" right desc="3rd floor roof, good view"]]
 
 Western block is a node installed on 2017-07-04 in NDG. It used the
-hardware that was originally planned for [[easternblock]], hence the
+hardware that was originally planned for easternblock, hence the
 pun on the name.
 
 # Technical details

merge the two antennas page
diff --git a/hardware.mdwn b/hardware.mdwn
index da8b61c9..2a33a7a8 100644
--- a/hardware.mdwn
+++ b/hardware.mdwn
@@ -11,7 +11,7 @@ Le réseau de Montréal préconise la bande de fréquence 2.4 GHz.
  * [[Routers]]
  * [[Support et grounds|Antennes]]
  * [[Câblage et connecteurs|cabling]]
- * [[Antennas]] - antennas and external adapters
+ * [[Antennes]] - antennas and external adapters
  * [[Radio]] - radio theory and practice, channels, protocols to use
 
 Voir aussi:
diff --git a/hardware/antennas.mdwn b/hardware/antennas.mdwn
deleted file mode 100644
index 5aae245d..00000000
--- a/hardware/antennas.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-Recommandée avec le [[Bullet M2HP|hardware/routers/#index2h3]]:
- * TP-Link 12 dBi ([[Addison|https://addison-electronique.com/antenne-exterieure-12dbi-pour-reseau-sans-fil.html]], [[Amazon|http://www.amazon.ca/gp/product/B003CFATO2]]

repurpose atlas elsewhere
diff --git a/nodes/atlas.mdwn b/nodes/atlas.mdwn
index 9d3ff668..875744cc 100644
--- a/nodes/atlas.mdwn
+++ b/nodes/atlas.mdwn
@@ -1,6 +1,9 @@
-[[!waypoint  lat="45.53257" lon="-73.61991" embed hidden width="400px" height="400px" right desc="4th floor window view facing south-west"]]
+[[!waypoint  lat="45.47828" lon="-73.62522" embed hidden width="400px" height="400px" right desc=""]]
 
-Possibility of a node here pointing south-west, on the 4th floor, with a good view all the way to the mountain, with a possibility of also having a small post facing north.
+Another node in NDG.
+
+This node was originally named after the Atlas store on Jean-Talon
+near Clark, but was repurposed in another location since.
 
 # Technical details
 
@@ -26,16 +29,16 @@ Software
 : OpenWRT AA-beta1 (tahini's)
 
 Hardware
-: Ubiquity Bullet M2 + sector antenna
+: Ubiquity Bullet M2 + 15 dBi (12? brand?) omnia antenna
 
 Power
-: 
+: ?
 
 Location
 : not deployed yet
 
 Azimuth
-: 120° south-east
+: 360°
 
 Panorama
 : N/A
@@ -51,7 +54,7 @@ Links
 
 ## Configuration dump
 
-See [the easternblock config](/nodes/easternblock), as both machines are currently configured similarly.
+See [the westernblock config](/nodes/westernblock), as both machines are currently configured similarly.
 
 [[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
 

boulette is down and will not come back up, at least not there
diff --git a/nodes/boulette.mdwn b/nodes/boulette.mdwn
deleted file mode 100644
index 9d91f3d9..00000000
--- a/nodes/boulette.mdwn
+++ /dev/null
@@ -1,158 +0,0 @@
-[[!waypoint lat="45.5335122" lon="-73.6031785" embed hidden width="400px" height="400px" right desc="Omnidirectional antenna 15 dBi, 10' up 3rd floor"]]
-
-15 dBI omnidirectional antenna connected to a Ubiquity Bullet M2 router.
-
-<a href="http://munin.orangeseeds.org/munin/reseaulibre.ca/boulette.reseaulibre.ca/adhoc_rssi.html"><img src="http://munin.orangeseeds.org/munin/reseaulibre.ca/boulette.reseaulibre.ca/adhoc_rssi-week.png" /></a>
-
-# Technical details
-
-[[!ymlfront data="""
-MAC: dc:9f:db:00:13:56
-IP: 172.16.0.2/32
-IPv6: fd64:2c08:9fa7::2/64
-"""]]
-
-hostname
-: boulette
-
-MAC address
-: MAC
-
-IPv6 address
-: IPv6
-
-IP address
-: IP
-
-Software
-: OpenWRT backfire
-
-Hardware
-: Ubiquity Bullet M2 + 15 dBi Hyperlink Tech
-   omnidirectional antenna
-
-Power
-: 15dBm/28mW (default)
-
-Location
-: 10 feet up on a pole, on top of the third floor
-
-[<img src="http://photos.orangeseeds.org/cache/documentation-radio-boulette-new-install-20131104-1.jpg_800.jpg" alt="Cheminée" align="right" />](http://photos.orangeseeds.org/#!/documentation-radio-boulette/new-install-20131104-1.jpg)
-
-Azimuth
-: 360°
-
-Panorama
-: N/A
-
-<!-- mettre à jour anarc.at/services quand on change ici -->
-Status
-: [[!taglink down]]
-
-Operator
-: [[users/anarcat]]
-
-Links
-: [[carton]], [[roadkiller]], [[Grace]], [[plastik]]
-
-Configuration
-=============
-
-This node runs babel according to the [[documentation/babel]] howto.
-
-Here is the [full backup of the configuration](uci-export.txt). See also
-the [list of installed packages](opkg-installed.txt) and the firewall
-rules (empty), [[firewall.user]].
-
-Babel
------
-
-    babeld.@general[0]=general
-    babeld.@general[0].local_server=33231
-    babeld.@filter[0]=filter
-    babeld.@filter[0].ignore=true
-    babeld.@filter[0].type=redistribute
-    babeld.@filter[0].ip=0.0.0.0/0
-    babeld.@filter[0].le=0
-    babeld.@filter[0].proto=3
-    babeld.@filter[0].action=metric 128
-    babeld.wan=interface
-    babeld.lan=interface
-
-DHCP and DNS
-------------
-
-Doesn't serve any DHCP!
-
-    dhcp.lan.ignore=1
-    dhcp.wan=dhcp
-    dhcp.wan.interface=wan
-    dhcp.wan.ignore=1
-
-Network
--------
-
-    network.lan=interface
-    network.lan.type=bridge
-    network.lan.proto=static
-    network.lan.mtu=1500
-    network.lan.ifname=eth0
-    network.lan.accept_ra=0
-    network.lan.send_rs=0
-    network.lan.ip6addr=fd64:2c08:9fa7::2/64
-    network.lan.dns=172.16.0.1
-    network.lan.gateway=172.16.0.1
-    network.lan.netmask=255.255.255.255
-    network.lan.ipaddr=172.16.0.2
-    network.wan=interface
-    network.wan.ifname=wlan0
-    network.wan.proto=static
-    network.wan.ipaddr=169.254.32.13
-    network.wan.netmask=255.255.255.255
-
-IPv6
-----
-
-    radvd.@interface[0]=interface
-    radvd.@interface[0].interface=lan
-    radvd.@interface[0].AdvSendAdvert=1
-    radvd.@interface[0].AdvManagedFlag=0
-    radvd.@interface[0].AdvOtherConfigFlag=0
-    radvd.@interface[0].client=
-    radvd.@interface[0].ignore=1
-    radvd.@prefix[0]=prefix
-    radvd.@prefix[0].interface=lan
-    radvd.@prefix[0].prefix=
-    radvd.@prefix[0].AdvOnLink=1
-    radvd.@prefix[0].AdvAutonomous=1
-    radvd.@prefix[0].AdvRouterAddr=0
-    radvd.@prefix[0].ignore=0
-    radvd.@route[0]=route
-    radvd.@route[0].interface=lan
-    radvd.@route[0].prefix=
-    radvd.@route[0].ignore=1
-    radvd.@rdnss[0]=rdnss
-    radvd.@rdnss[0].interface=lan
-    radvd.@rdnss[0].addr=
-    radvd.@rdnss[0].ignore=1
-    radvd.@dnssl[0]=dnssl
-    radvd.@dnssl[0].interface=lan
-    radvd.@dnssl[0].suffix=
-    radvd.@dnssl[0].ignore=1
-
-Wifi
-----
-
-    wireless.radio0=wifi-device
-    wireless.radio0.type=mac80211
-    wireless.radio0.macaddr=dc:9f:db:00:13:56
-    wireless.radio0.hwmode=11ng
-    wireless.radio0.htmode=HT20
-    wireless.radio0.ht_capab=SHORT-GI-40 TX-STBC RX-STBC1 DSSS_CCK-40
-    wireless.radio0.channel=1
-    wireless.@wifi-iface[0]=wifi-iface
-    wireless.@wifi-iface[0].device=radio0
-    wireless.@wifi-iface[0].encryption=none
-    wireless.@wifi-iface[0].mode=adhoc
-    wireless.@wifi-iface[0].bssid=02:CA:FF:EE:BA:BE
-    wireless.@wifi-iface[0].ssid=relais.reseaulibre.ca

clarify hardware on westernblock
diff --git a/nodes/westernblock.mdwn b/nodes/westernblock.mdwn
index c1c1b59b..6fc7511a 100644
--- a/nodes/westernblock.mdwn
+++ b/nodes/westernblock.mdwn
@@ -28,10 +28,10 @@ Software
 : OpenWRT AA-beta
 
 Hardware
-: Ubiquiti Bullet HP
+: Ubiquiti Bullet HP + 12 (15?) dBi Hyperlink Tech (?) omni antenna
 
 Power
-: 15 dBi antenna
+: ?
 
 Location
 : Rooftop

sort out some achats that were done
diff --git a/hardware/achats/2012-12-nanostation.mdwn b/hardware/achats/2012-12-nanostation.mdwn
index 4b550bf4..716f1b64 100644
--- a/hardware/achats/2012-12-nanostation.mdwn
+++ b/hardware/achats/2012-12-nanostation.mdwn
@@ -43,3 +43,5 @@ Est-ce que certains AP viennent avec un PoE? (Nano?)
 Si vous avez du matériel en trop que vous voulez revendre, ajoutez votre nom ici et une façon de vous contacter:
 
 * nom / matériel / contact
+
+[[done]]
diff --git a/hardware/achats/2013-02-achat.mdwn b/hardware/achats/2013-02-achat.mdwn
index 46b3973b..d233f252 100644
--- a/hardware/achats/2013-02-achat.mdwn
+++ b/hardware/achats/2013-02-achat.mdwn
@@ -45,3 +45,5 @@ Si vous avez du matériel en trop que vous voulez revendre, ajoutez votre nom ic
 
 * nom / matériel / contact
 * [[R|http://wiki.reseaulibre.ca/users/R/]] / 2 x [injecteur PoE 24V][]
+
+[[done]]

put a new node online in NDG
the hardware used was the one previously assigned to easternblock, so the node was named westernblock
diff --git a/nodes/easternblock.mdwn b/nodes/easternblock.mdwn
index ee68b475..565a3ac7 100644
--- a/nodes/easternblock.mdwn
+++ b/nodes/easternblock.mdwn
@@ -1,14 +1,11 @@
 [[!waypoint lat="45.53445" lon="-73.62015" embed hidden width="400px" height="400px" right desc="3rd floor roof, good view"]]
 
-Eastern Block has showed interest in having a node on their roof. They can find roof access.
+Eastern Block has showed interest in having a node on their roof. They
+can find roof access.
 
-# Technical details
+The hardware for this node was re-assigned to [[westernblock]] on 2017-07-04.
 
-[[!ymlfront data="""
-MAC: DC:9F:DB:06:D5:BE
-IP: 172.16.0.6/32
-IPv6: fd64:2c08:9fa7:2::/64
-"""]]
+# Technical details
 
 hostname
 : easternblock
@@ -41,7 +38,7 @@ Panorama
 : N/A
 
 Status
-: [[!taglink planned]]
+: [[!taglink prospect]]
 
 Operator
 : [[users/anarcat]]
@@ -49,82 +46,6 @@ Operator
 Links
 : 
 
-## Configuration
-
-### System
-
-    package system
-    
-    config system
-            option timezone 'America/Montreal'
-            option hostname 'easternblock'
-
-### Babel
-
-    package babeld
-    
-    config general
-            option local_server '33123'
-    
-    config filter
-            option ignore 'true'
-    
-    config interface 'wan'
-    
-    config interface 'lan'
-
-The following sits in `/etc/babeld.conf`:
-
-    redistribute local ip 192.168.1.0/24 deny
-
-### Network
-
-    package network
-    
-    config interface 'loopback'
-            option ifname 'lo'
-            option proto 'static'
-            option ipaddr '127.0.0.1'
-            option netmask '255.0.0.0'
-    
-    config interface 'lan'
-            option ifname 'eth0'
-            option type 'bridge'
-            option proto 'static'
-            option netmask '255.255.255.0'
-            option ip6addr 'fd64:2c08:9fa7:2::/64'
-            option ipaddr '192.168.1.1'
-    
-    config interface 'wan'
-            option ifname 'wlan0'
-            option proto 'static'
-            option ipaddr '172.16.0.6'
-            option netmask '255.255.255.255'
-            option dns '172.16.0.1'
-
-### Radio
-
-    package wireless
-    
-    config wifi-device 'radio0'
-            option type 'mac80211'
-            option macaddr 'dc:9f:db:06:d5:be'
-            option hwmode '11ng'
-            option htmode 'HT20'
-            list ht_capab 'SHORT-GI-40'
-            list ht_capab 'TX-STBC'
-            list ht_capab 'RX-STBC1'
-            list ht_capab 'DSSS_CCK-40'
-            option channel '1'
-    
-    config wifi-iface
-            option device 'radio0'
-            option encryption 'none'
-            option mode 'adhoc'
-            option ssid 'relais.reseaulibre.ca'
-            option bssid '02:CA:FF:EE:BA:BE'
-            option network 'wan'
-
 [[!meta copyright="Copyright © 2011 Antoine Beaupré"]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
diff --git a/nodes/westernblock.mdwn b/nodes/westernblock.mdwn
new file mode 100644
index 00000000..c1c1b59b
--- /dev/null
+++ b/nodes/westernblock.mdwn
@@ -0,0 +1,140 @@
+[[!waypoint lat="45.47849" lon="-73.62376" embed hidden width="400px" height="400px" right desc="3rd floor roof, good view"]]
+
+Western block is a node installed on 2017-07-04 in NDG. It used the
+hardware that was originally planned for [[easternblock]], hence the
+pun on the name.
+
+# Technical details
+
+[[!ymlfront data="""
+MAC: DC:9F:DB:06:D5:BE
+IP: 172.16.0.6/32
+IPv6: fd64:2c08:9fa7:2::/64
+"""]]
+
+hostname
+: westernblock
+
+MAC address
+: MAC
+
+IPv6 address
+: IPv6
+
+IP address
+: IP
+
+Software
+: OpenWRT AA-beta
+
+Hardware
+: Ubiquiti Bullet HP
+
+Power
+: 15 dBi antenna
+
+Location
+: Rooftop
+
+Azimuth
+: 360°
+
+Panorama
+: N/A
+
+Status
+: [[!taglink up]]
+
+Operator
+: [[users/anarcat]]
+
+Links
+: 
+
+## Configuration
+
+### System
+
+    package system
+    
+    config system
+            option timezone 'America/Montreal'
+            option hostname 'easternblock'
+
+Note: the hardware still needs to be renamed and relabeled to "westernblock".
+
+### Babel
+
+    package babeld
+    
+    config general
+            option local_server '33123'
+    
+    config filter
+            option ignore 'true'
+    
+    config interface 'wan'
+    
+    config interface 'lan'
+

(fichier de différences tronqué)
outremont link down
diff --git a/nodes/koumbit-outremont.mdwn b/nodes/koumbit-outremont.mdwn
index 4d2ee91f..fcdd9e22 100644
--- a/nodes/koumbit-outremont.mdwn
+++ b/nodes/koumbit-outremont.mdwn
@@ -39,10 +39,10 @@ Panorama
 : N/A
 
 Status
-: [[!taglink up]]
+: [[!taglink down]]
 
 Operator
-: [[users/anarcat]] [[users/gboudrias]]
+: [[users/anarcat]]
 
 Links
 : None yet, possible with scientist-poly

diff --git a/nodes/casgrain-gounod.mdwn b/nodes/casgrain-gounod.mdwn
index f1719e10..a68f9130 100644
--- a/nodes/casgrain-gounod.mdwn
+++ b/nodes/casgrain-gounod.mdwn
@@ -43,7 +43,7 @@ Links
 
 # Services
 
-Point-to-Point Relay (directional setups only), Internet Access (IPV6), fiber/cable cross-connect
+Point-to-Point Relay (directional setups only), Internet Access (IPV6), fiber/cable cross-connects
 
 # Photos
 

diff --git a/nodes/casgrain-gounod.mdwn b/nodes/casgrain-gounod.mdwn
index ffb44764..f1719e10 100644
--- a/nodes/casgrain-gounod.mdwn
+++ b/nodes/casgrain-gounod.mdwn
@@ -1,4 +1,4 @@
-[[!waypoint lat="45.538637" lon="-73.626336" embed hidden width="950px" height="400px" right desc="airMAX AC node on the roof"]]
+[[!waypoint lat="45.538637" lon="-73.626336" embed hidden width="950px" height="400px" right desc="airMAX AC node on the roof (30 feet from ground)"]]
 
 # Technical details
 
@@ -43,7 +43,7 @@ Links
 
 # Services
 
-Point-to-Point Relay (directional setups only)
+Point-to-Point Relay (directional setups only), Internet Access (IPV6), fiber/cable cross-connect
 
 # Photos
 

diff --git a/nodes/casgrain-gounod.mdwn b/nodes/casgrain-gounod.mdwn
index 4b82b42d..ffb44764 100644
--- a/nodes/casgrain-gounod.mdwn
+++ b/nodes/casgrain-gounod.mdwn
@@ -1,4 +1,4 @@
-[[!waypoint lat="45.5" lon="-73.666667" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
+[[!waypoint lat="45.538637" lon="-73.626336" embed hidden width="950px" height="400px" right desc="airMAX AC node on the roof"]]
 
 # Technical details
 
@@ -27,7 +27,7 @@ IP address
 : IP
 
 Hardware
-: 
+: Ubiquiti airMAX AC - Multiple - please contact me for directional setups
 
 Location
 : roof
@@ -43,7 +43,7 @@ Links
 
 # Services
 
-Relay (open)
+Point-to-Point Relay (directional setups only)
 
 # Photos
 

diff --git a/nodes/casgrain-gounod.mdwn b/nodes/casgrain-gounod.mdwn
new file mode 100644
index 00000000..4b82b42d
--- /dev/null
+++ b/nodes/casgrain-gounod.mdwn
@@ -0,0 +1,62 @@
+[[!waypoint lat="45.5" lon="-73.666667" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
+
+# Technical details
+
+[[!ymlfront data="""
+MAC: (mac address here)
+IP: (pick one from [[policy/numbering]])
+IPv6: 
+"""]]
+
+hostname
+: (node hostname here)
+
+Type
+: relay
+
+SSID
+: casgrain-gounod.relais.reseaulibre.ca
+
+MAC address
+: MAC
+
+IPv6 address
+: IPv6
+
+IP address
+: IP
+
+Hardware
+: 
+
+Location
+: roof
+
+Status
+: [[!taglink planned]]
+
+Operator
+: [[/users/pleblond]]
+
+Links
+: (a wiki link to the nodes this node is connected with, will show up on the map, metadata in [[links]])
+
+# Services
+
+Relay (open)
+
+# Photos
+
+(You can upload images when you edit this page. Feel free to upload photos
+of your installation or of the panorama. It will help other people who may
+want to link with you.)
+
+[[!meta copyright="Copyright © 2011-2013 Your Name Here"]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|meta/gfdl]]."]]"""]]

diff --git a/nodes/tarator.mdwn b/nodes/tarator.mdwn
index 02628f6f..59771eb8 100644
--- a/nodes/tarator.mdwn
+++ b/nodes/tarator.mdwn
@@ -35,7 +35,7 @@ Location
 : roof
 
 Status
-: [[!taglink down]]
+: [[!taglink down]] (retirée le 2017-04-01)
 
 Operator
 : [[/users/bgm]]

diff --git a/nodes/tarator.mdwn b/nodes/tarator.mdwn
index ff02bca1..02628f6f 100644
--- a/nodes/tarator.mdwn
+++ b/nodes/tarator.mdwn
@@ -35,7 +35,7 @@ Location
 : roof
 
 Status
-: [[!taglink up]]
+: [[!taglink down]]
 
 Operator
 : [[/users/bgm]]
@@ -60,8 +60,3 @@ Construction du support pour l'antenne:
 * le 2e morceau de bois (celui du bas) est fixé au poteau du balcon, avec deux collets métalliques.
 
 (merci [[users/scientist]]!)
-
-# Statistiques
-
-<a href="https://www.bidon.ca/munin/net4.bidon.ca/tarator.net4.bidon.ca/adhoc_rssi.html"><img src="https://www.bidon.ca/munin/net4.bidon.ca/tarator.net4.bidon.ca/adhoc_rssi-month.png" /></a>
-

removed
diff --git a/nodes/hogan.mdwn b/nodes/hogan.mdwn
deleted file mode 100644
index fd823678..00000000
--- a/nodes/hogan.mdwn
+++ /dev/null
@@ -1,60 +0,0 @@
-[[!waypoint lat="45.5" lon="-73.666667" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
-
-# Technical details
-
-[[!ymlfront data="""
-MAC: (mac address here)
-IP: (pick one from [[policy/numbering]])
-IPv6: 
-"""]]
-
-hostname
-: HoganRouter
-
-Type
-: relay
-
-SSID
-: hogan.relais.reseaulibre.ca
-
-MAC address
-: MAC
-
-IPv6 address
-: IPv6
-
-IP address
-: IP
-
-Hardware
-: Linksys WRT54GS
-
-Location
-: Rue Hogan au coin de Hochelaga dans une fenêtre au 2e étage avec vue vers l'ouest
-
-Status
-: [[!taglink planned]]
-
-Operator
-: [[/users/Stef20]]
-
-Links
-: [[links]])
-
-# Services
-
-N/A
-
-# Photos
-
-N/A
-
-[[!meta copyright="Copyright © 2011-2013 Your Name Here"]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|meta/gfdl]]."]]"""]]

diff --git a/nodes/hogan.mdwn b/nodes/hogan.mdwn
index 9fcbfebe..fd823678 100644
--- a/nodes/hogan.mdwn
+++ b/nodes/hogan.mdwn
@@ -30,7 +30,7 @@ Hardware
 : Linksys WRT54GS
 
 Location
-: Rue Hogan au coin de Hochelaga
+: Rue Hogan au coin de Hochelaga dans une fenêtre au 2e étage avec vue vers l'ouest
 
 Status
 : [[!taglink planned]]

diff --git a/nodes/hogan.mdwn b/nodes/hogan.mdwn
index e5a496d1..9fcbfebe 100644
--- a/nodes/hogan.mdwn
+++ b/nodes/hogan.mdwn
@@ -33,23 +33,21 @@ Location
 : Rue Hogan au coin de Hochelaga
 
 Status
-: [[!taglink planned]] (can also be up, down, planned, unknown)
+: [[!taglink planned]]
 
 Operator
 : [[/users/Stef20]]
 
 Links
-: (a wiki link to the nodes this node is connected with, will show up on the map, metadata in [[links]])
+: [[links]])
 
 # Services
 
-(you can document services accessible from this location)
+N/A
 
 # Photos
 
-(You can upload images when you edit this page. Feel free to upload photos
-of your installation or of the panorama. It will help other people who may
-want to link with you.)
+N/A
 
 [[!meta copyright="Copyright © 2011-2013 Your Name Here"]]
 

diff --git a/nodes/hogan.mdwn b/nodes/hogan.mdwn
new file mode 100644
index 00000000..e5a496d1
--- /dev/null
+++ b/nodes/hogan.mdwn
@@ -0,0 +1,62 @@
+[[!waypoint lat="45.5" lon="-73.666667" embed hidden width="950px" height="400px" right desc="A node on my roof"]]
+
+# Technical details
+
+[[!ymlfront data="""
+MAC: (mac address here)
+IP: (pick one from [[policy/numbering]])
+IPv6: 
+"""]]
+
+hostname
+: HoganRouter
+
+Type
+: relay
+
+SSID
+: hogan.relais.reseaulibre.ca
+
+MAC address
+: MAC
+
+IPv6 address
+: IPv6
+
+IP address
+: IP
+
+Hardware
+: Linksys WRT54GS
+
+Location
+: Rue Hogan au coin de Hochelaga
+
+Status
+: [[!taglink planned]] (can also be up, down, planned, unknown)
+
+Operator
+: [[/users/Stef20]]
+
+Links
+: (a wiki link to the nodes this node is connected with, will show up on the map, metadata in [[links]])
+
+# Services
+
+(you can document services accessible from this location)
+
+# Photos
+
+(You can upload images when you edit this page. Feel free to upload photos
+of your installation or of the panorama. It will help other people who may
+want to link with you.)
+
+[[!meta copyright="Copyright © 2011-2013 Your Name Here"]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|meta/gfdl]]."]]"""]]

diff --git a/nodes/nadjaf.mdwn b/nodes/nadjaf.mdwn
index cb0fd588..c1b47af8 100644
--- a/nodes/nadjaf.mdwn
+++ b/nodes/nadjaf.mdwn
@@ -32,6 +32,10 @@ Opérateur
 Liens
 : [[/nodes/amman]]
 
+# Photos
+
+[[!img rl-nadjaf.jpg alt="Powerbeam M5"]]
+
 # Services
 
 Possibilité de créer un lien de dorsale entre le bassin Peel et Verdun.

Add nadjaf photo
diff --git a/nodes/nadjaf/rl-nadjaf.jpg b/nodes/nadjaf/rl-nadjaf.jpg
new file mode 100644
index 00000000..40155fec
Binary files /dev/null and b/nodes/nadjaf/rl-nadjaf.jpg differ

add rl-amman-latakia-201611.jpg (smaller)
diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index bb5733a7..144b971d 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -41,7 +41,7 @@ Connexion dorsale entre les arrondissements Verdun et le bassin Peel/Notre-Dame.
 
 # Photos
 
-[[!img rl-amman-latakia-201611.jpg alt="Powerbeam M5"]]
+[[!img rl-amman-latakia-201611-small.jpg alt="Powerbeam M5"]]
 
 [[!img RL-IMG_20161030_115542.jpg alt="Powerbeam M5"]]
 
diff --git a/nodes/amman/rl-amman-latakia-201611-small.jpg b/nodes/amman/rl-amman-latakia-201611-small.jpg
new file mode 100644
index 00000000..ff2eb1ea
Binary files /dev/null and b/nodes/amman/rl-amman-latakia-201611-small.jpg differ

add rl-amman-latakia-201611.jpg
diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index be48c3a7..bb5733a7 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -41,6 +41,8 @@ Connexion dorsale entre les arrondissements Verdun et le bassin Peel/Notre-Dame.
 
 # Photos
 
+[[!img rl-amman-latakia-201611.jpg alt="Powerbeam M5"]]
+
 [[!img RL-IMG_20161030_115542.jpg alt="Powerbeam M5"]]
 
 [[!img IMG_0066_amman-small.jpg alt="Nanobridge M5"]]

add rl-amman-latakia-201611.jpg
diff --git a/nodes/amman/rl-amman-latakia-201611.jpg b/nodes/amman/rl-amman-latakia-201611.jpg
new file mode 100644
index 00000000..c7881b28
Binary files /dev/null and b/nodes/amman/rl-amman-latakia-201611.jpg differ

diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index 7fe0143f..be48c3a7 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -69,6 +69,9 @@ https://community.ubnt.com/t5/airOS-Software-Configuration/airOS-5-6-9-w-Custom-
 # Default route
 ip -6 route add default dev br0 via fe80::c66e:1fff:feb9:f942
 
+# Nadjaf
+ip -6 route add 2607:f2c0:f00f:29e0::/60 dev br0 via fe80::46d9:e7ff:fe66:af3f
+
 # Enable IP forwarding for IPv6
 sysctl -w net.ipv6.conf.all.forwarding=1
 </pre>

diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index 88201094..7fe0143f 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -56,6 +56,9 @@ Il y a des routes configurées statiquement sur alep.b.c pour 2607:​f2c0:​f0
 
 Sur amman, il faut configurer la route par défaut. L'interface web ne semble pas supporter ça.
 
+Par contre, depuis 5.6.9, le support pour les scripts persistants a été enlevé du firmware AirOS:
+https://community.ubnt.com/t5/airOS-Software-Configuration/airOS-5-6-9-w-Custom-Script-Support/m-p/1624488#U1624488
+
 <pre>
 # cat /etc/persistent/rc.poststart 
 </pre>

diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index 6b2b1ad9..88201094 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -52,6 +52,10 @@ Connexion dorsale entre les arrondissements Verdun et le bassin Peel/Notre-Dame.
 
 ## Routes statiques
 
+Il y a des routes configurées statiquement sur alep.b.c pour 2607:​f2c0:​f00f:​29c0:​:1 (amman) et 2607:​f2c0:​f00f:​29e0:​:1 (nadjaf).
+
+Sur amman, il faut configurer la route par défaut. L'interface web ne semble pas supporter ça.
+
 <pre>
 # cat /etc/persistent/rc.poststart 
 </pre>

diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index 59fbd296..6b2b1ad9 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -50,7 +50,7 @@ Connexion dorsale entre les arrondissements Verdun et le bassin Peel/Notre-Dame.
 * Voir: [[documentation/nanobridge]] (vieille documentation)
 * Initialement un Nanobeam M5, remplacé par un Powerbeam M5-400-ISO.
 
-## Routes statiques pour NDG
+## Routes statiques
 
 <pre>
 # cat /etc/persistent/rc.poststart 
@@ -59,8 +59,8 @@ Connexion dorsale entre les arrondissements Verdun et le bassin Peel/Notre-Dame.
 <pre>
 #!/bin/sh
 
-# Route to NDG
-ip -6 route add fd64:2c08:9fa7:f1e0::/60 via fe80::ba27:ebff:fea1:81ed dev ath0
+# Default route
+ip -6 route add default dev br0 via fe80::c66e:1fff:feb9:f942
 
 # Enable IP forwarding for IPv6
 sysctl -w net.ipv6.conf.all.forwarding=1
@@ -82,6 +82,7 @@ c.f. [[http://wiki.ubnt.com/Manual_Routes]]
 * Services > SSH Server > Authorized keys : upload pub key
 * Services > System log > ✔ remote log, remote log ip address = karbala, remote log port = 5544 (udp).
 * Wireless > Mode > Access point, ssid = verdun-peel.reseaulibre.ca, channel width = 10 mHz, freq = 5785, security = wpa2-aes/psk, pass: même que wpa2 à verdun.
+* Advantaced > Wireless: RTS Threshold = 2346, Distance: 2 miles, multicast data = allow, multicast enhancement = enable, Installer EIRP Control : disable, Extra reporting = enable, client isolation = disable (hum?), sensitivity threshold = -96 dBm.
 
 ## Grafana (todo)
 

diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index f3fb7e1c..59fbd296 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -77,11 +77,11 @@ c.f. [[http://wiki.ubnt.com/Manual_Routes]]
 ## Configurations AirOS
 
 * Network > Network Role > Network Mode: bridge, config mode = simple.
-* Network > Network Role > Network Settings: Static, 192.168.55.7/24, ✔ enable IPv6 (static), 2607:f2c0:f00f:29c0::/60
+* Network > Network Role > Network Settings: Static, 192.168.55.7/24, ✔ enable IPv6 (static), 2607:f2c0:f00f:29c0::1/60
 * System > Device > Device name : amman
 * Services > SSH Server > Authorized keys : upload pub key
 * Services > System log > ✔ remote log, remote log ip address = karbala, remote log port = 5544 (udp).
-* Wireless > Mode > Access point (?) *TODO*
+* Wireless > Mode > Access point, ssid = verdun-peel.reseaulibre.ca, channel width = 10 mHz, freq = 5785, security = wpa2-aes/psk, pass: même que wpa2 à verdun.
 
 ## Grafana (todo)
 

amman: insert powerbeam image.
diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index 7ea2fa57..f3fb7e1c 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -41,6 +41,8 @@ Connexion dorsale entre les arrondissements Verdun et le bassin Peel/Notre-Dame.
 
 # Photos
 
+[[!img RL-IMG_20161030_115542.jpg alt="Powerbeam M5"]]
+
 [[!img IMG_0066_amman-small.jpg alt="Nanobridge M5"]]
 
 # Autres détails techniques

Add RL-IMG_20161030_115542.jpg for node amman.
diff --git a/nodes/amman/RL-IMG_20161030_115542.jpg b/nodes/amman/RL-IMG_20161030_115542.jpg
new file mode 100644
index 00000000..56296846
Binary files /dev/null and b/nodes/amman/RL-IMG_20161030_115542.jpg differ

diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index bcd778a6..7ea2fa57 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -72,9 +72,20 @@ Configurations are saved on AirOS with:
 
 c.f. [[http://wiki.ubnt.com/Manual_Routes]]
 
-## Graphes munin
+## Configurations AirOS
 
-Générés à partir de mon routeur principal. Le plugin munin se connecte en ssh avec un clé.
+* Network > Network Role > Network Mode: bridge, config mode = simple.
+* Network > Network Role > Network Settings: Static, 192.168.55.7/24, ✔ enable IPv6 (static), 2607:f2c0:f00f:29c0::/60
+* System > Device > Device name : amman
+* Services > SSH Server > Authorized keys : upload pub key
+* Services > System log > ✔ remote log, remote log ip address = karbala, remote log port = 5544 (udp).
+* Wireless > Mode > Access point (?) *TODO*
+
+## Grafana (todo)
+
+## Graphes munin (désuet?)
+
+Générés à partir de mon routeur principal. Le plugin munin se connecte en ssh avec une clé publique.
 
 * [[http://community.ubnt.com/t5/airOS-Software-Configuration/Now-with-SSH-support-AirOS-plugin-for-Munin-monitoring/td-p/469169]]
 * [[https://github.com/munin-monitoring/contrib/blob/master/plugins/network/ubiquiti_airos_]]

ajouter internet bien commun
diff --git a/videos.mdwn b/videos.mdwn
index 6bde175b..3965bd63 100644
--- a/videos.mdwn
+++ b/videos.mdwn
@@ -7,3 +7,5 @@
 Introduction en 5 minutes, juillet 2013:
 
 <iframe width="640" height="390" src="https://www.youtube.com/embed/NkoKltqWVGk" frameborder="0" allowfullscreen></iframe>
+
+Internet, bien commun: <http://www.culturelibre.ca/2014/02/14/internet-bien-commun/>

make link HTTPS
diff --git a/videos.mdwn b/videos.mdwn
index ae58194d..6bde175b 100644
--- a/videos.mdwn
+++ b/videos.mdwn
@@ -2,8 +2,8 @@
 
 À Montréal Python, novembre 2012:
 
-<iframe width="640" height="390" src="http://www.youtube.com/embed/Dzequ8RzlxA" frameborder="0" allowfullscreen></iframe>
+<iframe width="640" height="390" src="https://www.youtube.com/embed/Dzequ8RzlxA" frameborder="0" allowfullscreen></iframe>
 
 Introduction en 5 minutes, juillet 2013:
 
-<iframe width="640" height="390" src="http://www.youtube.com/embed/NkoKltqWVGk" frameborder="0" allowfullscreen></iframe>
+<iframe width="640" height="390" src="https://www.youtube.com/embed/NkoKltqWVGk" frameborder="0" allowfullscreen></iframe>

diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index 8632c18f..bcd778a6 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -1,14 +1,11 @@
-[[!waypoint lat="45.465670" lon="-73.572189" embed hidden width="400px" height="400px" right desc="Nanobridge M5 sur un toit."]]
+[[!waypoint lat="45.465670" lon="-73.572189" embed hidden width="400px" height="400px" right desc="Powerbeam M5 sur un toit."]]
 
 [[!toc]]
 
 # Technical details
 
-
 [[!ymlfront data="""
 MAC: 80:2A:A8:B4:92:E5
-IP: 
-IPv6: 
 """]]
 
 hostname
@@ -23,12 +20,6 @@ SSID
 MAC address
 : MAC
 
-IPv6 address
-: IPv6
-
-IP address
-: IP
-
 Hardware
 : Ubiquity Powerbeam M5-400-ISO (5 gHz)
 
@@ -54,7 +45,8 @@ Connexion dorsale entre les arrondissements Verdun et le bassin Peel/Notre-Dame.
 
 # Autres détails techniques
 
-* Voir: [[documentation/nanobridge]]
+* Voir: [[documentation/nanobridge]] (vieille documentation)
+* Initialement un Nanobeam M5, remplacé par un Powerbeam M5-400-ISO.
 
 ## Routes statiques pour NDG
 

fix markup
diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index 0ff71081..8632c18f 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -4,7 +4,9 @@
 
 # Technical details
 
-* MAC: 80:2A:A8:B4:92:E5
+
+[[!ymlfront data="""
+MAC: 80:2A:A8:B4:92:E5
 IP: 
 IPv6: 
 """]]

mac
diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index 5ac81c46..0ff71081 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -4,8 +4,7 @@
 
 # Technical details
 
-[[!ymlfront data="""
-MAC: DC:9F:DB:7E:3E:E0
+* MAC: 80:2A:A8:B4:92:E5
 IP: 
 IPv6: 
 """]]

diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index 4ba07c37..5ac81c46 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -29,7 +29,7 @@ IP address
 : IP
 
 Hardware
-: Nanobridge M5 (5 gHz)
+: Ubiquity Powerbeam M5-400-ISO (5 gHz)
 
 Location
 : toit

diff --git a/nodes/amman.mdwn b/nodes/amman.mdwn
index de2fb44b..4ba07c37 100644
--- a/nodes/amman.mdwn
+++ b/nodes/amman.mdwn
@@ -45,18 +45,12 @@ Links
 
 # Services
 
-Connexion dorsale entre les arrondissements Verdun et NDG.
+Connexion dorsale entre les arrondissements Verdun et le bassin Peel/Notre-Dame.
 
 # Photos
 
 [[!img IMG_0066_amman-small.jpg alt="Nanobridge M5"]]
 
-# Statistiques
-
-<a href="https://munin.bidon.ca/net4.bidon.ca/amman.net4.bidon.ca/adhoc_rssi.html"><img src="https://munin.bidon.ca/net4.bidon.ca/amman.net4.bidon.ca/adhoc_rssi-week.png" /></a>
-
-<a href="https://munin.bidon.ca/net4.bidon.ca/amman.net4.bidon.ca/if_wlan0.html"><img src="https://munin.bidon.ca/net4.bidon.ca/amman.net4.bidon.ca/if_wlan0-week.png" /></a>
-
 # Autres détails techniques
 
 * Voir: [[documentation/nanobridge]]

removed
diff --git a/nodes/bgm6.mdwn b/nodes/bgm6.mdwn
deleted file mode 100644
index 5c5c49c7..00000000
--- a/nodes/bgm6.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-[[!waypoint lat="45.461395" lon="-73.568401" embed hidden width="400px" height="400px" right desc="Noeud"]]
-
-Noeud potentiel. 2e étage d'un édifice de deux étages (mais il y a des édifices de 3 étages dans le coin)
-
- * MAC address:
- * IP address:
- * IPv6 address:
- * Software:
- * Hardware:
- * Power:
- * Location:
- * Status: [[!taglink planned]]
- * Links:
- * Azimuth:
- * Panorama:
- * Operator: [[users/bgm]]

removed
diff --git a/nodes/bgm5.mdwn b/nodes/bgm5.mdwn
deleted file mode 100644
index 3c19fab7..00000000
--- a/nodes/bgm5.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-[[!waypoint lat="45.457746" lon="-73.564563" embed hidden width="400px" height="400px" right desc="A node"]]
-
-Possibilité de poser une antenne (3e étage, sur la 2e avenue côté est). Je renommerai quand la personne m'aura confirmé. -bgm.
-
- * MAC address:
- * IP address:
- * IPv6 address:
- * Software:
- * Hardware:
- * Power:
- * Location:
- * Status: [[!taglink planned]]
- * Links:
- * Azimuth:
- * Panorama:
- * Operator: [[users/bgm]]

oups, je pensais que grace était down aussi, mais je suis pas sûr là
diff --git a/nodes/Grace.mdwn b/nodes/Grace.mdwn
index 43d2fca8..320a7e7b 100644
--- a/nodes/Grace.mdwn
+++ b/nodes/Grace.mdwn
@@ -39,7 +39,7 @@ Panorama
 : [sud, emplacement choisi](http://farm8.staticflickr.com/7133/6906119462_365c57fccf_o.jpg), [nord, possible pour le futur](http://farm6.staticflickr.com/5315/6906098540_70182d6840_o.jpg)
 
 Status
-: [[!taglink down]]
+: [[!taglink up]]
 
 Operator
 : [[/users/elecnix]]

GFDL 1.2+

test