leap compile with new leap_cli

6 files changed, 38 insertions, 21 deletions

diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index b702729..5d92a8c 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -59,22 +59,22 @@ hosts:
   clam: 
     domain_full: clam.dev.bitmask.net
     domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGhp+VPPTcONp7C4skQ4CGQzxBIrDlwO9ZJT1jwelANycjrcfgnpqQMdA3G6bwuscaaWgiYXt1BU8VZoRJ+xrOs="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhuxJnnyJ2X/6TCTphlBuw/Z81NjOjTo0/BmqmfGUDkPjgQqiEpK57tfRJw2YStYTYOrSnQte4AKVu4ek132yBOhqqUMuc7ArzQDTGw68QSokK9qCIxmKSB9g+tgGHJO/zFkpZuHW1pV2ZmXZJihjSbRwrMwtOd1xGS1k+VCQvNOIuZf22cocv+tFCnhvC19bh03tQtXAkE8QZn2ttHp4B3rBOqxe+UAJ49/RHUdogCVZf2NjmGfFaOkBP51qkSgbT63Zh5xw2wo7p13d4KOqIFOjyubb8M/UxAmbnUaRfm/V0TIF0hA4DYE/kwLPQ+ay27hFoPioluvRaWfJNwr0B"
     ip_address: "176.53.69.22"
   elk: 
     domain_full: elk.dev.bitmask.net
     domain_internal: elk.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdA5B3ZqPDl9Yk7gWHp6oIDjDK30KaZG8i3wyXObgHuSgNDmcScmaUoCSz7Fe6NiQG3WZpghWPxOWiylRjZtew="
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPuZCp3RFNIlD54FaL2+sXbydr8ftXqbHV+BC7k8tqLjy6x+GZZWqoe/Dd6xiDF7s9mCIXcMDEjZTTXJzhhyWuI="
     ip_address: "176.53.69.127"
   starfish: 
     domain_full: starfish.dev.bitmask.net
     domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7qjSYGtPkINMlvbnwoVoz17PkZzWOrMVj1uBzs2ujP+pGwG9T+jndimNr2IGgjYXTOtDseLg4X1Q1pp5Lzaao="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC58CBa1kcGT2Tr9u2SQhD3OOTXYMLedHwpdKZ7JTRjQvUlnGdI9otWj5naznSrLtYrcSfNTMqhdOWNIlwOaZYMibILYkZOM6XP9StQ6oANOrfVswM6EZR+eXOGDJQ4u5fZSjYizIOZFAOIL4/rIqDGo6QApXlrnpl8tqGAcpsZxPolPCzgR5bzUjN3vSOoIRPzFxkXm3jPkCPNdW8r+vYMCI+aVMA5R8sHByaLeBlvj8+3wkwXtLZShmJk5l6z/DkeXQwAtxOhVxAD0jhHPXN+4BSkJMrQupuhoV2YQb7Zy9UaQ5IxvJrM7JJQvXFq28rGDM1CBYcZj6O3wFIB7eKF"
     ip_address: "176.53.69.23"
   urchin: 
     domain_full: urchin.dev.bitmask.net
     domain_internal: urchin.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAPRJHzN1Bef4Ktuly/BE1Spv6q4YDWOTjfG8M5BDFbu+orhD0O8m2vhUwKAFQ0OEOV+QQEgubfNNoqVRBE1Jd4="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDe1xNQ1vi5/B5BBVgRhifWrU1d1Klxyvl/htSTjlePWiUAw9vnOf8O/f0lb8uH5MQaOkfLgs+xo8+oxf7JBR0qpeQ5njtkb0clu+BeTxKilpRjmxhnMdSi99VRCQ0TGkQ1sDS4ipg1DZDezPqhFCWhnSW29mvWWEbfi0WgS09waaxdu6HW02xepFi7wyYCF2+GQPbi7y28gr6IfFEBvOEo+hVJqbWUWgBklD53dNWkx1euu75lauW88UzNYY47bGjRhMOxHATnXAhRfpeRAoxqKIFKCFxsJRnXEi8vJxBLWhBnOwPLj9UyXwE4irbBKbkgtYYkkmHA9XXEAkLCekL1"
     ip_address: "176.53.69.21"
 ip_address: "176.53.69.22"
 location: 
diff --git a/hiera/deer.yaml b/hiera/deer.yaml
index 3d5b0b6..53af5c9 100644
--- a/hiera/deer.yaml
+++ b/hiera/deer.yaml
@@ -77,6 +77,12 @@ tor:
   contacts: 
     - sysdev@leap.se
   family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT"
+  hidden_service: ~
+  key: 
+    address: ~
+    private: ~
+    public: ~
+    type: RSA
   nickname: deeruSaR9IekHdQGUGI
   type: exit
 x509: 
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index afa5f19..7aa4981 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -182,22 +182,22 @@ hosts:
   clam: 
     domain_full: clam.dev.bitmask.net
     domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGhp+VPPTcONp7C4skQ4CGQzxBIrDlwO9ZJT1jwelANycjrcfgnpqQMdA3G6bwuscaaWgiYXt1BU8VZoRJ+xrOs="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhuxJnnyJ2X/6TCTphlBuw/Z81NjOjTo0/BmqmfGUDkPjgQqiEpK57tfRJw2YStYTYOrSnQte4AKVu4ek132yBOhqqUMuc7ArzQDTGw68QSokK9qCIxmKSB9g+tgGHJO/zFkpZuHW1pV2ZmXZJihjSbRwrMwtOd1xGS1k+VCQvNOIuZf22cocv+tFCnhvC19bh03tQtXAkE8QZn2ttHp4B3rBOqxe+UAJ49/RHUdogCVZf2NjmGfFaOkBP51qkSgbT63Zh5xw2wo7p13d4KOqIFOjyubb8M/UxAmbnUaRfm/V0TIF0hA4DYE/kwLPQ+ay27hFoPioluvRaWfJNwr0B"
     ip_address: "176.53.69.22"
   elk: 
     domain_full: elk.dev.bitmask.net
     domain_internal: elk.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdA5B3ZqPDl9Yk7gWHp6oIDjDK30KaZG8i3wyXObgHuSgNDmcScmaUoCSz7Fe6NiQG3WZpghWPxOWiylRjZtew="
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPuZCp3RFNIlD54FaL2+sXbydr8ftXqbHV+BC7k8tqLjy6x+GZZWqoe/Dd6xiDF7s9mCIXcMDEjZTTXJzhhyWuI="
     ip_address: "176.53.69.127"
   starfish: 
     domain_full: starfish.dev.bitmask.net
     domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7qjSYGtPkINMlvbnwoVoz17PkZzWOrMVj1uBzs2ujP+pGwG9T+jndimNr2IGgjYXTOtDseLg4X1Q1pp5Lzaao="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC58CBa1kcGT2Tr9u2SQhD3OOTXYMLedHwpdKZ7JTRjQvUlnGdI9otWj5naznSrLtYrcSfNTMqhdOWNIlwOaZYMibILYkZOM6XP9StQ6oANOrfVswM6EZR+eXOGDJQ4u5fZSjYizIOZFAOIL4/rIqDGo6QApXlrnpl8tqGAcpsZxPolPCzgR5bzUjN3vSOoIRPzFxkXm3jPkCPNdW8r+vYMCI+aVMA5R8sHByaLeBlvj8+3wkwXtLZShmJk5l6z/DkeXQwAtxOhVxAD0jhHPXN+4BSkJMrQupuhoV2YQb7Zy9UaQ5IxvJrM7JJQvXFq28rGDM1CBYcZj6O3wFIB7eKF"
     ip_address: "176.53.69.23"
   urchin: 
     domain_full: urchin.dev.bitmask.net
     domain_internal: urchin.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAPRJHzN1Bef4Ktuly/BE1Spv6q4YDWOTjfG8M5BDFbu+orhD0O8m2vhUwKAFQ0OEOV+QQEgubfNNoqVRBE1Jd4="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDe1xNQ1vi5/B5BBVgRhifWrU1d1Klxyvl/htSTjlePWiUAw9vnOf8O/f0lb8uH5MQaOkfLgs+xo8+oxf7JBR0qpeQ5njtkb0clu+BeTxKilpRjmxhnMdSi99VRCQ0TGkQ1sDS4ipg1DZDezPqhFCWhnSW29mvWWEbfi0WgS09waaxdu6HW02xepFi7wyYCF2+GQPbi7y28gr6IfFEBvOEo+hVJqbWUWgBklD53dNWkx1euu75lauW88UzNYY47bGjRhMOxHATnXAhRfpeRAoxqKIFKCFxsJRnXEi8vJxBLWhBnOwPLj9UyXwE4irbBKbkgtYYkkmHA9XXEAkLCekL1"
     ip_address: "176.53.69.21"
 ip_address: "176.53.69.13"
 location: 
@@ -314,11 +314,22 @@ webapp:
     password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY
     salt: 86497f034c8ef09b097f5c757ab038b7
     username: webapp
-  customization_dir: /srv/leap/files/files/webapp/
+  customization_dir: /srv/leap/files/webapp/
   default_service_level: 1
   domain: dev.bitmask.net
   engines: 
     - support
+  forbidden_usernames: 
+    - admin
+    - administrator
+    - arin-admin
+    - certmaster
+    - contact
+    - info
+    - maildrop
+    - postmaster
+    - ssladmin
+    - www-data
   git: 
     revision: origin/develop
     source: "https://leap.se/git/leap_web"
diff --git a/hiera/elk.yaml b/hiera/elk.yaml
index 3901682..60942ce 100644
--- a/hiera/elk.yaml
+++ b/hiera/elk.yaml
@@ -59,22 +59,22 @@ hosts:
   clam: 
     domain_full: clam.dev.bitmask.net
     domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGhp+VPPTcONp7C4skQ4CGQzxBIrDlwO9ZJT1jwelANycjrcfgnpqQMdA3G6bwuscaaWgiYXt1BU8VZoRJ+xrOs="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhuxJnnyJ2X/6TCTphlBuw/Z81NjOjTo0/BmqmfGUDkPjgQqiEpK57tfRJw2YStYTYOrSnQte4AKVu4ek132yBOhqqUMuc7ArzQDTGw68QSokK9qCIxmKSB9g+tgGHJO/zFkpZuHW1pV2ZmXZJihjSbRwrMwtOd1xGS1k+VCQvNOIuZf22cocv+tFCnhvC19bh03tQtXAkE8QZn2ttHp4B3rBOqxe+UAJ49/RHUdogCVZf2NjmGfFaOkBP51qkSgbT63Zh5xw2wo7p13d4KOqIFOjyubb8M/UxAmbnUaRfm/V0TIF0hA4DYE/kwLPQ+ay27hFoPioluvRaWfJNwr0B"
     ip_address: "176.53.69.22"
   elk: 
     domain_full: elk.dev.bitmask.net
     domain_internal: elk.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdA5B3ZqPDl9Yk7gWHp6oIDjDK30KaZG8i3wyXObgHuSgNDmcScmaUoCSz7Fe6NiQG3WZpghWPxOWiylRjZtew="
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPuZCp3RFNIlD54FaL2+sXbydr8ftXqbHV+BC7k8tqLjy6x+GZZWqoe/Dd6xiDF7s9mCIXcMDEjZTTXJzhhyWuI="
     ip_address: "176.53.69.127"
   starfish: 
     domain_full: starfish.dev.bitmask.net
     domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7qjSYGtPkINMlvbnwoVoz17PkZzWOrMVj1uBzs2ujP+pGwG9T+jndimNr2IGgjYXTOtDseLg4X1Q1pp5Lzaao="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC58CBa1kcGT2Tr9u2SQhD3OOTXYMLedHwpdKZ7JTRjQvUlnGdI9otWj5naznSrLtYrcSfNTMqhdOWNIlwOaZYMibILYkZOM6XP9StQ6oANOrfVswM6EZR+eXOGDJQ4u5fZSjYizIOZFAOIL4/rIqDGo6QApXlrnpl8tqGAcpsZxPolPCzgR5bzUjN3vSOoIRPzFxkXm3jPkCPNdW8r+vYMCI+aVMA5R8sHByaLeBlvj8+3wkwXtLZShmJk5l6z/DkeXQwAtxOhVxAD0jhHPXN+4BSkJMrQupuhoV2YQb7Zy9UaQ5IxvJrM7JJQvXFq28rGDM1CBYcZj6O3wFIB7eKF"
     ip_address: "176.53.69.23"
   urchin: 
     domain_full: urchin.dev.bitmask.net
     domain_internal: urchin.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAPRJHzN1Bef4Ktuly/BE1Spv6q4YDWOTjfG8M5BDFbu+orhD0O8m2vhUwKAFQ0OEOV+QQEgubfNNoqVRBE1Jd4="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDe1xNQ1vi5/B5BBVgRhifWrU1d1Klxyvl/htSTjlePWiUAw9vnOf8O/f0lb8uH5MQaOkfLgs+xo8+oxf7JBR0qpeQ5njtkb0clu+BeTxKilpRjmxhnMdSi99VRCQ0TGkQ1sDS4ipg1DZDezPqhFCWhnSW29mvWWEbfi0WgS09waaxdu6HW02xepFi7wyYCF2+GQPbi7y28gr6IfFEBvOEo+hVJqbWUWgBklD53dNWkx1euu75lauW88UzNYY47bGjRhMOxHATnXAhRfpeRAoxqKIFKCFxsJRnXEi8vJxBLWhBnOwPLj9UyXwE4irbBKbkgtYYkkmHA9XXEAkLCekL1"
     ip_address: "176.53.69.21"
 ip_address: "176.53.69.127"
 location: 
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
index eedddc3..2ce5be8 100644
--- a/hiera/starfish.yaml
+++ b/hiera/starfish.yaml
@@ -43,22 +43,22 @@ hosts:
   clam: 
     domain_full: clam.dev.bitmask.net
     domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGhp+VPPTcONp7C4skQ4CGQzxBIrDlwO9ZJT1jwelANycjrcfgnpqQMdA3G6bwuscaaWgiYXt1BU8VZoRJ+xrOs="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhuxJnnyJ2X/6TCTphlBuw/Z81NjOjTo0/BmqmfGUDkPjgQqiEpK57tfRJw2YStYTYOrSnQte4AKVu4ek132yBOhqqUMuc7ArzQDTGw68QSokK9qCIxmKSB9g+tgGHJO/zFkpZuHW1pV2ZmXZJihjSbRwrMwtOd1xGS1k+VCQvNOIuZf22cocv+tFCnhvC19bh03tQtXAkE8QZn2ttHp4B3rBOqxe+UAJ49/RHUdogCVZf2NjmGfFaOkBP51qkSgbT63Zh5xw2wo7p13d4KOqIFOjyubb8M/UxAmbnUaRfm/V0TIF0hA4DYE/kwLPQ+ay27hFoPioluvRaWfJNwr0B"
     ip_address: "176.53.69.22"
   elk: 
     domain_full: elk.dev.bitmask.net
     domain_internal: elk.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdA5B3ZqPDl9Yk7gWHp6oIDjDK30KaZG8i3wyXObgHuSgNDmcScmaUoCSz7Fe6NiQG3WZpghWPxOWiylRjZtew="
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPuZCp3RFNIlD54FaL2+sXbydr8ftXqbHV+BC7k8tqLjy6x+GZZWqoe/Dd6xiDF7s9mCIXcMDEjZTTXJzhhyWuI="
     ip_address: "176.53.69.127"
   starfish: 
     domain_full: starfish.dev.bitmask.net
     domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7qjSYGtPkINMlvbnwoVoz17PkZzWOrMVj1uBzs2ujP+pGwG9T+jndimNr2IGgjYXTOtDseLg4X1Q1pp5Lzaao="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC58CBa1kcGT2Tr9u2SQhD3OOTXYMLedHwpdKZ7JTRjQvUlnGdI9otWj5naznSrLtYrcSfNTMqhdOWNIlwOaZYMibILYkZOM6XP9StQ6oANOrfVswM6EZR+eXOGDJQ4u5fZSjYizIOZFAOIL4/rIqDGo6QApXlrnpl8tqGAcpsZxPolPCzgR5bzUjN3vSOoIRPzFxkXm3jPkCPNdW8r+vYMCI+aVMA5R8sHByaLeBlvj8+3wkwXtLZShmJk5l6z/DkeXQwAtxOhVxAD0jhHPXN+4BSkJMrQupuhoV2YQb7Zy9UaQ5IxvJrM7JJQvXFq28rGDM1CBYcZj6O3wFIB7eKF"
     ip_address: "176.53.69.23"
   urchin: 
     domain_full: urchin.dev.bitmask.net
     domain_internal: urchin.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAPRJHzN1Bef4Ktuly/BE1Spv6q4YDWOTjfG8M5BDFbu+orhD0O8m2vhUwKAFQ0OEOV+QQEgubfNNoqVRBE1Jd4="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDe1xNQ1vi5/B5BBVgRhifWrU1d1Klxyvl/htSTjlePWiUAw9vnOf8O/f0lb8uH5MQaOkfLgs+xo8+oxf7JBR0qpeQ5njtkb0clu+BeTxKilpRjmxhnMdSi99VRCQ0TGkQ1sDS4ipg1DZDezPqhFCWhnSW29mvWWEbfi0WgS09waaxdu6HW02xepFi7wyYCF2+GQPbi7y28gr6IfFEBvOEo+hVJqbWUWgBklD53dNWkx1euu75lauW88UzNYY47bGjRhMOxHATnXAhRfpeRAoxqKIFKCFxsJRnXEi8vJxBLWhBnOwPLj9UyXwE4irbBKbkgtYYkkmHA9XXEAkLCekL1"
     ip_address: "176.53.69.21"
 ip_address: "176.53.69.23"
 location: 
diff --git a/hiera/urchin.yaml b/hiera/urchin.yaml
index d018e1c..ac6e6fc 100644
--- a/hiera/urchin.yaml
+++ b/hiera/urchin.yaml
@@ -60,22 +60,22 @@ hosts:
   clam: 
     domain_full: clam.dev.bitmask.net
     domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGhp+VPPTcONp7C4skQ4CGQzxBIrDlwO9ZJT1jwelANycjrcfgnpqQMdA3G6bwuscaaWgiYXt1BU8VZoRJ+xrOs="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhuxJnnyJ2X/6TCTphlBuw/Z81NjOjTo0/BmqmfGUDkPjgQqiEpK57tfRJw2YStYTYOrSnQte4AKVu4ek132yBOhqqUMuc7ArzQDTGw68QSokK9qCIxmKSB9g+tgGHJO/zFkpZuHW1pV2ZmXZJihjSbRwrMwtOd1xGS1k+VCQvNOIuZf22cocv+tFCnhvC19bh03tQtXAkE8QZn2ttHp4B3rBOqxe+UAJ49/RHUdogCVZf2NjmGfFaOkBP51qkSgbT63Zh5xw2wo7p13d4KOqIFOjyubb8M/UxAmbnUaRfm/V0TIF0hA4DYE/kwLPQ+ay27hFoPioluvRaWfJNwr0B"
     ip_address: "176.53.69.22"
   elk: 
     domain_full: elk.dev.bitmask.net
     domain_internal: elk.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdA5B3ZqPDl9Yk7gWHp6oIDjDK30KaZG8i3wyXObgHuSgNDmcScmaUoCSz7Fe6NiQG3WZpghWPxOWiylRjZtew="
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPuZCp3RFNIlD54FaL2+sXbydr8ftXqbHV+BC7k8tqLjy6x+GZZWqoe/Dd6xiDF7s9mCIXcMDEjZTTXJzhhyWuI="
     ip_address: "176.53.69.127"
   starfish: 
     domain_full: starfish.dev.bitmask.net
     domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE7qjSYGtPkINMlvbnwoVoz17PkZzWOrMVj1uBzs2ujP+pGwG9T+jndimNr2IGgjYXTOtDseLg4X1Q1pp5Lzaao="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC58CBa1kcGT2Tr9u2SQhD3OOTXYMLedHwpdKZ7JTRjQvUlnGdI9otWj5naznSrLtYrcSfNTMqhdOWNIlwOaZYMibILYkZOM6XP9StQ6oANOrfVswM6EZR+eXOGDJQ4u5fZSjYizIOZFAOIL4/rIqDGo6QApXlrnpl8tqGAcpsZxPolPCzgR5bzUjN3vSOoIRPzFxkXm3jPkCPNdW8r+vYMCI+aVMA5R8sHByaLeBlvj8+3wkwXtLZShmJk5l6z/DkeXQwAtxOhVxAD0jhHPXN+4BSkJMrQupuhoV2YQb7Zy9UaQ5IxvJrM7JJQvXFq28rGDM1CBYcZj6O3wFIB7eKF"
     ip_address: "176.53.69.23"
   urchin: 
     domain_full: urchin.dev.bitmask.net
     domain_internal: urchin.dev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAPRJHzN1Bef4Ktuly/BE1Spv6q4YDWOTjfG8M5BDFbu+orhD0O8m2vhUwKAFQ0OEOV+QQEgubfNNoqVRBE1Jd4="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDe1xNQ1vi5/B5BBVgRhifWrU1d1Klxyvl/htSTjlePWiUAw9vnOf8O/f0lb8uH5MQaOkfLgs+xo8+oxf7JBR0qpeQ5njtkb0clu+BeTxKilpRjmxhnMdSi99VRCQ0TGkQ1sDS4ipg1DZDezPqhFCWhnSW29mvWWEbfi0WgS09waaxdu6HW02xepFi7wyYCF2+GQPbi7y28gr6IfFEBvOEo+hVJqbWUWgBklD53dNWkx1euu75lauW88UzNYY47bGjRhMOxHATnXAhRfpeRAoxqKIFKCFxsJRnXEi8vJxBLWhBnOwPLj9UyXwE4irbBKbkgtYYkkmHA9XXEAkLCekL1"
     ip_address: "176.53.69.21"
 ip_address: "176.53.69.21"
 location: