From 565feefd281b69e7726280f15e5fb1e709e2e22d Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 7 Feb 2017 02:11:32 +0100
Subject: [PATCH] add ssh pubkey for cpe.ap

---
 salt-pillar/keys.sls | 17 +++++++++++++++++
 salt-pillar/top.sls  |  1 +
 salt/cpe/ap.sh       |  3 ++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 salt-pillar/keys.sls

diff --git a/salt-pillar/keys.sls b/salt-pillar/keys.sls
new file mode 100644
index 000000000..d41331b
--- /dev/null
+++ b/salt-pillar/keys.sls
@@ -0,0 +1,17 @@
+#!yaml|gpg
+
+ssh:
+  pubkey: |
+    -----BEGIN PGP MESSAGE-----
+    
+    hQEMA2PKcvDMvlKLAQf/ePGt4Mpiuyp1rRaIA09QFJWxDZc84xo5r9oWxqW/liaC
+    0WmygDAlf0VGS6AeQg5p0SSwkca7Jky/uXYSCjqfYNTc0iO2UVKDsnyRpcWd+Y0B
+    pEJiNQzb3vbXdhmC3vvbBcHAOzZpnNZm/bYyJIqir5JeyEFQuqNkzHg08BhSy83y
+    kE9Jc6QePoNiK5TsBWxwfsq6/A79YFtSq+t0d7ZcoxgOuHw7kSAsQa5uWsXcL79L
+    fAhAUbzhlbkHO8IZpYDIwUstLJGfMSKxN1MRLHzhKhhoSbxna1IeiiAXKPUIQLRX
+    bNIMnobIleieMC8wGeJpIkbITsZSrPfzYOy0Z88S+9KUAco6RAetf9Vs+QcmwdSf
+    M8Igs9LyE1su2+EGSiihigLja6BQrAqbaFVp8r+UOI8fihmaluqAUCB0GBntym7P
+    eZY5whLu877ZxpXKqop5N+3BXDV/VnNjqHEarVGQ2AUeh9gt60g7HF7tAJs9Batk
+    ZbCED5wsM6oevCsGwEdEUCfjW5paVFu0XxQiqWrSy4utOPlo7A==
+    =vkYs
+    -----END PGP MESSAGE-----
diff --git a/salt-pillar/top.sls b/salt-pillar/top.sls
index 00a8ad4..f8c9f66 100644
--- a/salt-pillar/top.sls
+++ b/salt-pillar/top.sls
@@ -9,6 +9,7 @@ base:
     - switches
     - cpe.aps
     - collectd.server1
+    - keys
   'priv*-gw':
     - dhcp
     - bird.radv
diff --git a/salt/cpe/ap.sh b/salt/cpe/ap.sh
index b50473b..839a274 100644
--- a/salt/cpe/ap.sh
+++ b/salt/cpe/ap.sh
@@ -13,7 +13,8 @@ ssh root@{{ pillar['hosts-inet']['mgmt'][hostname] }} \
 # Set root password
 echo -e '{{ conf['password'] }}\n{{ conf['password'] }}' | passwd
 
-# TODO: add ssh pubkey
+# add ssh pubkey
+echo "{{ pillar['ssh']['pubkey'] }}" > /etc/dropbear/authorized_keys
 
 # System configuration
 uci batch <<__UCI__