From 96fb70cb5ebb5338d90d3d2d97405e5468efa71f Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 22 Dec 2015 22:06:47 +0100 Subject: [PATCH] Add news item about the SCALE 14x talk. --- activities.mdwn | 12 ++++++++---- news/scale14x.mdwn | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 news/scale14x.mdwn diff --git a/activities.mdwn b/activities.mdwn index 9e546c7..8074277 100644 --- a/activities.mdwn +++ b/activities.mdwn @@ -7,13 +7,17 @@ not listed here, we would also like to hear about it. ### Upcoming events -* [FOSSETCON](http://www.fossetcon.org/2015), - November 19-21, 2015, at Hilton Lake Buena Vista, United States. - There is a talk titled [Secure peer networking with tinc](http://www.fossetcon.org/2015/sessions/secure-peer-networking-tinc) - in Palm 4 from 10:15 to 11:00. +* [SCALE 14x](https://www.socallinuxexpo.org/scale/14x), + January 21-24, 2016, in the Pasedana Convention Center, California, United States. + There is a talk titled [Secure Mesh VPN w/ Service Discovery](https://www.socallinuxexpo.org/scale/14x/presentations/secure-mesh-vpn-w-service-discovery) + in Ballroom F from 11:30 to 12:30. ### Past events +* [FOSSETCON](http://www.fossetcon.org/2015), + November 19-21, 2015, at Hilton Lake Buena Vista, United States. + There was a talk titled [Secure peer networking with tinc](http://www.fossetcon.org/2015/sessions/secure-peer-networking-tinc) + in Palm 4 from 10:15 to 11:00. * [OHM2013](https://ohm2013.org/site/), July 31-August 4, 2013, near Alkmaar, The Netherlands. There was a lightning talk about tinc ([slides](/presentations/OHM2013/The_tinc_VPN.pdf)) in T2 at 15:55 on August 1, a talk about [ChaosVPN](http://wiki.hamburg.ccc.de/index.php/ChaosVPN) in T6 at 13:00 on August 1, diff --git a/news/scale14x.mdwn b/news/scale14x.mdwn new file mode 100644 index 0000000..0714e7b --- /dev/null +++ b/news/scale14x.mdwn @@ -0,0 +1,5 @@ +[[!meta author="guus"]] + +At [SCALE 14x](https://www.socallinuxexpo.org/scale/14x), which is held in Pasedana, +California on January 21-24, there will be a talk titled +[Secure Mesh VPN w/ Service Discovery](https://www.socallinuxexpo.org/scale/14x/presentations/secure-mesh-vpn-w-service-discovery). -- 2.20.1