summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-12-07 15:21:55 -0400
committerJoey Hess2014-12-07 15:21:55 -0400
commit2fe0b28982c403ea49c71854da11354067527394 (patch)
tree9460f920078d14a068e709b76b610fa641f089be
parent3b0b6f44dd60807d7005421eed95cf53c731fc28 (diff)
more uses for hostContext
-rw-r--r--config-joey.hs8
-rw-r--r--src/Propellor/Property/Ssh.hs2
-rw-r--r--src/Propellor/Types/PrivData.hs2
3 files changed, 6 insertions, 6 deletions
diff --git a/config-joey.hs b/config-joey.hs
index abbd846d..9e0cf90f 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -209,7 +209,7 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
& ipv4 "107.170.31.195"
& DigitalOcean.distroKernel
- & Ssh.hostKeys (Context "diatom.kitenet.net")
+ & Ssh.hostKeys hostContext
& Apt.unattendedUpgrades
& Apt.serviceInstalledRunning "ntp"
& Postfix.satellite
@@ -273,9 +273,9 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
& Apt.unattendedUpgrades
& Systemd.installed
& Systemd.persistentJournal
- & Ssh.hostKeys ctx
+ & Ssh.hostKeys hostContext
& sshPubKey "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAJkoPRhUGT8EId6m37uBdYEtq42VNwslKnc9mmO+89ody066q6seHKeFY6ImfwjcyIjM30RTzEwftuVNQnbEB0="
- & Ssh.keyImported SshRsa "joey" ctx
+ & Ssh.keyImported SshRsa "joey" hostContext
& Apt.serviceInstalledRunning "swapspace"
& alias "eubackup.kitenet.net"
@@ -315,8 +315,6 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
-- that port for ssh, for traveling on bad networks that
-- block 22.
& Ssh.listenPort 80
- where
- ctx = Context "elephant.kitenet.net"
--' __|II| ,.
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs
index 88a757bd..fcae6498 100644
--- a/src/Propellor/Property/Ssh.hs
+++ b/src/Propellor/Property/Ssh.hs
@@ -80,7 +80,7 @@ randomHostKeys = flagFile prop "/etc/ssh/.unique_host_keys"
[ "DPKG_MAINTSCRIPT_NAME=postinst DPKG_MAINTSCRIPT_PACKAGE=openssh-server /var/lib/dpkg/info/openssh-server.postinst configure" ]
-- | Sets all types of ssh host keys from the privdata.
-hostKeys :: Context -> Property
+hostKeys :: IsContext c => c -> Property
hostKeys ctx = propertyList "known ssh host keys"
[ hostKey SshDsa ctx
, hostKey SshRsa ctx
diff --git a/src/Propellor/Types/PrivData.hs b/src/Propellor/Types/PrivData.hs
index a18e7cec..80dad762 100644
--- a/src/Propellor/Types/PrivData.hs
+++ b/src/Propellor/Types/PrivData.hs
@@ -21,6 +21,8 @@ data PrivDataField
-- Context "www.example.com" could be used for the SSL cert
-- for the web server serving that domain. Multiple hosts might
-- use that privdata.
+--
+-- This appears in serlialized privdata files.
newtype Context = Context String
deriving (Read, Show, Ord, Eq)