[catchup] Updates from hungryroot.service

ssh/.ssh/config

@@ -61,15 +61,9 @@ Host hungryroot.service mundilfari.service kari.service
 
 # Inside our network, skip strict host key checking
 Host *.service
-  User root
   StrictHostKeyChecking no
 
-# Bare metal hosts
-Host hati.local tarqeq.local daphnis.local loge.local hyperion.local dione.local phoebe.local iapetus.local titan.local paaliaq.local kiviuq.local kari.local siarnaq.local skathi.local tarvos.local rhea.local erriapus.local mimas.local polydeuces.local mundilfari.local ijiraq.local
-  User powellc
-
-# Root hosts
-Host penobscotbaypress.com atlas.local
+Host vrobbler.service mopidy.service penobscotbaypress.com atlas.local dns.service
   User root
 
 #####
@@ -88,6 +82,7 @@ Host *.local *.service
     VerifyHostKeyDNS no
 
 Host bastion.service
+    User root
     Port 33
 
 ## Jail hosts all need a jump
@@ -96,8 +91,8 @@ Host bastion.service
 #  IdentityFile ~/.ssh/jails
 #  Hostname %h
 #
-#Match exec "onsubnet --not 192.168.40." host *.service
-#  User root
-#  IdentityFile ~/.ssh/jails
-#  Hostname %h
-#  ProxyJump bastion.unbl.ink
+Match exec "onsubnet --not 192.168.40." host *.service
+  Hostname %h
+  ProxyJump bastion.unbl.ink
+  User powellc
+  IdentityFile ~/.ssh/jails