Add drone

.drone.yml

@@ -0,0 +1,15 @@
+---
+kind: pipeline
+type: exec
+name: deploy
+
+steps:
+
+- name: rsync
+  commands:
+   - ./push.sh
+
+  when:
+    branch: master
+    event: push
+    

pages/01.home/burble-dn42-services/default.md

@@ -11,7 +11,7 @@ List of public services provided by the burble.dn42 network.
 
 ## Public Website
 
-[burble.dn42](http://burble.dn42/) (dn42 link)  
+[burble.dn42](https://burble.dn42/) (dn42 link)  
 [dn42.burble.com](https://dn42.burble.com/) (public internet link)
 
 This website is built using [GRAV](https://getgrav.org/) and currently
@@ -20,6 +20,15 @@ hosted on dn42-fr-sbg1.  The public internet version is protected by
 Longer term, regional replicas of the DN42 site may be provided however
 this is not currently configured.
 
+
+## PrivateBin Instance
+
+[paste.burble.dn42](https://paste.burble.dn42) (dn42 link)  
+[paste.burble.com](https://paste.burble.com) (public internet link)
+
+burble.dn42 PrivateBin instance.
+
+
 ## Looking Glass
 
 [lg.burble.com](https://lg.burble.com) (public internet link)  
@@ -64,8 +73,8 @@ All services support DNS over HTTPs on port 443, and DNS over TLS on port 843.
 |:--|:--|
 | [wiki.dn42](https://wiki.dn42/) | (editable via DN42)|
 | [wiki.burble.dn42](https://wiki.burble.dn42/) | (editable via DN42)|
-| [dn42.dev](http://dn42.dev/) | (read-only via public internet)|
+| [dn42.dev](https://dn42.dev/) | (read-only via public internet)|
-| [wiki.burble.com](http://wiki.burble.com/) | (read-only via public internet)|
+| [wiki.burble.com](https://wiki.burble.com/) | (read-only via public internet)|
 <br/>
 burble.dn42 maintains a globally distributed mirror of the DN42 Wiki, and is part of
 the wiki.dn42 anycast group. 
@@ -130,8 +139,8 @@ The source code for the service is available in the
 
 * [https://grc.burble.com/](https://grc.burble.com/) (public internet link)
 * [https://lg-grc.burble.com/](https://lg-grc.burble.com/) (public internet link)
-* [http://collector.dn42/](http://collector.dn42/) (DN42 link)
+* [https://collector.dn42/](https://collector.dn42/) (DN42 link)
-* [http://lg.collector.dn42/](http://lg.collector.dn42/) (DN42 link)
+* [https://lg.collector.dn42/](https://lg.collector.dn42/) (DN42 link)
 * ssh shell@collector.dn42
 
 The [global route collector](https://git.dn42.us/burble/grc) provides a central
@@ -174,8 +183,8 @@ NTP time server on either the public or DN42 networks.
 
 ## Lounge IRC Gateway
 
-[lounge.burble.dn42](http://lounge.burble.dn42/) (dn42 link)  
+[lounge.burble.dn42](https://lounge.burble.dn42/) (dn42 link)  
-[lounge.burble.com](https://lounge.burble.com/) (public internet link)
+[lounge.burble.com](httpss://lounge.burble.com/) (public internet link)
 
 The burble.dn42 IRC web gateway is based on [thelounge](https://thelounge.chat/)
 and is provided for DN42 users to access and lurk on the
@@ -187,7 +196,7 @@ Note that the service is strictly limited to hackint channels.
 
 ## Public Git Repository
 
-[git.burble.dn42](http://git.burble.dn42/) (dn42 link)  
+[git.burble.dn42](https://git.burble.dn42/) (dn42 link)  
 [git.burble.com](https://git.burble.com/) (public internet link)
 
 burble.dn42 related code and configuration is mastered on a local git
@@ -207,7 +216,7 @@ to host on burble.dn42
 
 ### Hosted Grafana Service
 
-[http://grafana.burble.dn42](http://grafana.burble.dn42) dn42 link  
+[https://grafana.burble.dn42](https://grafana.burble.dn42) dn42 link  
 [https://grafana.burble.com](https://grafana.burble.com) public internet link
 
 The hosted grafana service has it's own page [here](/home/grafana-service).

pages/01.home/ipam/default.md

@@ -23,7 +23,8 @@ burble.dn42 IP addresses
 |wiki.burble.dn42|172.20.129.6|fd42:4242:2601:ac81::1|DN42 Wiki Mirror|
 |rproxy.burble.dn42|172.20.129.7|fd42:4242:2601:acf0::1|Distributed NGINX Reverse Proxy|
 |whois.burble.dn42|172.20.129.8|fd42:4242:2601:ac43::1|Whois service|
-| |_172.20.129.9-31_| |_Unallocated_|
+|git.dn42|172.20.129.9|fd42:4242:2601:2d42:fc5f:3a14:838e:a7a7|DN42 Git Service|
+| |_172.20.129.10-31_| |_Unallocated_|
 |collector.burble.dn42|None|fd42:4242:2601:36::b|burble.dn42 Route Collector|
 <br/>
 
@@ -50,18 +51,18 @@ burble.dn42 IP addresses
 |dn42-au-syd1.burble.dn42|172.20.129.180|fd42:4242:2601:38::1||
 |dn42-sg-sin2.burble.dn42|172.20.129.181|fd42:4242:2601:37::1||
 |dn42-jp-tyo1.burble.dn42|172.20.129.182|fd42:4242:2601:3e::1||
-|*unassigned*|*172.20.129.183*|*fd42:4242:2601:3c::1*||
+|dn42-us-mia1.burble.dn42|172.20.129.183|fd42:4242:2601:3c::1|*Use dn42-us-mia2*|
 |*unassigned*|*172.20.129.184*|*fd42:4242:2601:22::1*||
-|*unassigned*|172.20.129.185|fd42:4242:2601:39::1||
+|dn42-no-trd1.burble.dn42|172.20.129.185|fd42:4242:2601:39::1||
 |dn42-fr-rbx2.burble.dn42|172.20.129.186|fd42:4242:2601:32::1|*Use fr-rbx1*|
 |dn42-uk-lon1.burble.dn42|172.20.129.187|fd42:4242:2601:35::1||
 |dn42-fr-rbx1.burble.dn42|172.20.129.188|fd42:4242:2601:36::1||
-|dn42-lt-vil1.burble.dn42|172.20.129.189|fd42:4242:2601:3d::1||
+|dn42-lt-vil1.burble.dn42|172.20.129.189|fd42:4242:2601:3d::1|*Being decommissioned*|
 |dn42-uk-bri1.burble.dn42|172.20.129.190|fd42:4242:2601:20::1|Private Node|
 |&nbsp;|172.20.129.191|&nbsp;|Reserved|
 |dn42-uk-lon3.burble.dn42|&nbsp;|fd42:4242:2601:27::1|Private Node|
 |dn42-uk-lon4.burble.dn42|&nbsp;|fd42:4242:2601:29::1|Private Node|
-|*unassigned*|&nbsp;|*fd42:4242:2601:33::1*||
+|dn42-nl-ams1.burble.dn42|&nbsp;|fd42:4242:2601:33::1|Private Node|
 |*unassigned*|&nbsp;|*fd42:4242:2601:22::1*||
 
 #### burble.dn42 Nodes (Public)
@@ -74,10 +75,11 @@ burble.dn42 IP addresses
 |dn42-de-fra1.burble.com|176.96.138.245|2a0d:5940:1:c3::b35c||
 |dn42-lt-vil1.burble.com|195.181.241.93|2a02:7b40:c3b5:f15d::1||
 |dn42-ch-zur1.burble.com|45.91.92.111|2a0e:dc0:6:8::1||
+|dn42-no-trd1.burble.com|217.168.87.226|2001:678:dd0:ffff::25||
 |dn42-ca-bhs2.burble.com|158.69.248.26|2607:5300:120:81a::1||
 |dn42-us-nyc1.burble.com|185.213.26.143|2a0d:5600:33:b::1||
 |dn42-us-chi1.burble.com|193.29.63.150|2605:4840:3:10::ab2d||
-|dn42-us-mia2.burble.com|216.126.233.109|2a09:be40:2908:bc43::1||
+|dn42-us-mia2.burble.com|139.64.236.104|2606:f180:5::2:27e:cc65||
 |dn42-us-sea2.burble.com|96.8.121.205|&nbsp;||
 |dn42-us-dal3.burble.com|144.172.126.201|2602:fe64:8::4||
 |dn42-us-lax1.burble.com|185.215.224.214|2a0b:ae40:1:4a0a::5a||

pages/01.home/maintenance-log/default.md

@@ -10,6 +10,28 @@ A log of changes to the burble.dn42 network.
 
 ## burble.dn42 Maintenance Log
 
+#### 25th Jult 2020
+
+us-mia1 and us-mia2 have been swapped. The provider for the old us-mia2 (Stockservers)
+appears to have ceased trading, so the node has been swapped in case the original server
+disappears at short notice.
+
+no-trd1 has been added, courtesy of jastrup.
+
+lt-vil1 is being decommissioned and users will need to migrate to a different node to
+maintain service.
+
+#### 5th July 2020
+
+A busy weekend supporting the move of the DN42 registry to its new host.
+
+Remember to join the new mailing list at [https://groups.io/g/dn42](https://groups.io/g/dn42)
+and create yourself an account on the new registry [https://git.dn42.dev](https://git.dn42.dev)
+
+#### 10th June 2020
+
+Website moved again, and new paste.burble.dn42 service added.
+
 #### 6th June 2020
 
 The global route collector has had a long overdue upgrade. Please let me know

pages/02.peering/default.md

@@ -274,6 +274,8 @@ The burble.dn42 is fully meshed between nodes using wireguard tunnels.
 |**Tunnel IPv6 Link Local**|fe80::42:2601:31:1/64|
 |**Tunnel IPv6 ULA**|fd42:4242:2601:31::1/128|
 
+*lt-vil1 is being decommissioned*
+
 ####dn42-lt-vil1
 |||
 |---|---|
@@ -296,6 +298,17 @@ The burble.dn42 is fully meshed between nodes using wireguard tunnels.
 |**Tunnel IPv6 Link Local**|fe80::42:2601:28:1/64|
 |**Tunnel IPv6 ULA**|fd42:4242:2601:28::1/128|
 
+####dn42-no-trd1
+|||
+|---|---|
+|**Location**|Trondheim, Norway|
+|**Public Hostname**|dn42-no-trd1.burble.com|
+|**Public IPv4 Address**|217.168.87.226|
+|**Public IPv6 Address**|2001:678:dd0:ffff::25|
+|**Tunnel IPv4 Peer Address**|172.20.129.185/32|
+|**Tunnel IPv6 Link Local**|fe80::42:2601:39:1/64|
+|**Tunnel IPv6 ULA**|fd42:4242:2601:39::1/128|
+
 ### North America
 
 ####dn42-ca-bhs2
@@ -325,10 +338,10 @@ The burble.dn42 is fully meshed between nodes using wireguard tunnels.
 
 |||
 |---|---|
-|**Location**|StockServers, Miami, United States|
+|**Location**|Hotline Servers, Miami, United States|
 |**Public Hostname**|dn42-us-mia2.burble.com|
-|**Public IPv4 Address**|216.126.233.109|
+|**Public IPv4 Address**|139.64.236.104|
-|**Public IPv6 Address**|2a09:be40:2908:bc43::1|
+|**Public IPv6 Address**|2606:f180:5::2:27e:cc65|
 |**Tunnel IPv4 Peer Address**|172.20.129.164/32|
 |**Tunnel IPv6 Link Local**|fe80::42:2601:3f:1/64|
 |**Tunnel IPv6 ULA**|fd42:4242:2601:3f::1/128|

push.sh

@@ -4,17 +4,17 @@
 # where am I ?
 SCRIPTPATH="$(cd "$(dirname "$0")" ; pwd -P)"
 
-# grav hosts
+# website hosts
 hosts=(
-    'dn42-fr-sbg1.burble.dn42'
+    'rsyncd.tier2.fr-sbg1.burble.dn42'
 )
 
 for host in ${hosts[@]}
 do
     echo "Syncing host: $host"
-    rsync -avogp --chown=100:101 --chmod=D2550,F440 \
+    rsync -avogp --chown=100:101 --chmod=D2750,F640 \
           ${SCRIPTPATH}/pages/ \
-          root@${host}:/export/apps/grav/
+          deploy@${host}::bdn42
 done
 
 ########################################################################