summaryrefslogtreecommitdiff
path: root/src/Propellor/Types
diff options
context:
space:
mode:
authorJoey Hess2015-01-04 19:52:09 -0400
committerJoey Hess2015-01-04 19:52:09 -0400
commite22002a7a99ceaaf193a6aa83d3c03e256d79f52 (patch)
tree8a6460e3da5abfd0109d40e518fd1a8f233dc35b /src/Propellor/Types
parent2de60a902794669b40fae8c7135f989ccca2f8d5 (diff)
parent0794dfbd7c6f854c3e517486be0722e4cf61db34 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Types')
-rw-r--r--src/Propellor/Types/Dns.hs1
-rw-r--r--src/Propellor/Types/PrivData.hs4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/Types/Dns.hs b/src/Propellor/Types/Dns.hs
index 2fbf51e5..50297f57 100644
--- a/src/Propellor/Types/Dns.hs
+++ b/src/Propellor/Types/Dns.hs
@@ -62,6 +62,7 @@ data Record
| NS BindDomain
| TXT String
| SRV Word16 Word16 Word16 BindDomain
+ | SSHFP Int Int String
| INCLUDE FilePath
deriving (Read, Show, Eq, Ord)
diff --git a/src/Propellor/Types/PrivData.hs b/src/Propellor/Types/PrivData.hs
index c760ae55..c7909a6b 100644
--- a/src/Propellor/Types/PrivData.hs
+++ b/src/Propellor/Types/PrivData.hs
@@ -7,8 +7,8 @@ import Propellor.Types.OS
-- It's fine to add new constructors.
data PrivDataField
= DockerAuthentication
- | SshPubKey SshKeyType UserName -- ^ For host key, use empty UserName
- | SshPrivKey SshKeyType UserName
+ | SshPubKey SshKeyType UserName
+ | SshPrivKey SshKeyType UserName -- ^ For host key, use empty UserName
| SshAuthorizedKeys UserName
| Password UserName
| CryptPassword UserName