cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2015-01-08 23:02:06 -04:00
parent a8ed898d72
commit 5585778e54
Failed to extract signature
3 changed files with 912 additions and 887 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config-joey.hs
View File

@ -74,7 +74,6 @@ darkstar = host "darkstar.kitenet.net"
& Docker.configured & Docker.configured
! Docker.docked gitAnnexAndroidDev ! Docker.docked gitAnnexAndroidDev
& JoeySites.dkimInstalled
& JoeySites.postfixClientRelay (Context "darkstar.kitenet.net") & JoeySites.postfixClientRelay (Context "darkstar.kitenet.net")
& JoeySites.dkimMilter & JoeySites.dkimMilter

1761
privdata.joey/privdata.gpg
View File

File diff suppressed because it is too large Load Diff

37
src/Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -605,24 +605,6 @@ postfixClientRelay ctx = Postfix.mainCfFile `File.containsLines`
`requires` hasJoeyCAChain `requires` hasJoeyCAChain
`requires` hasPostfixCert ctx `requires` hasPostfixCert ctx
-- This does not configure postfix to use the dkim milter,
-- nor does it set up domainkey DNS.
dkimInstalled :: Property
dkimInstalled = propertyList "opendkim installed"
[ Apt.serviceInstalledRunning "opendkim"
, "/etc/default/opendkim" `File.containsLine`
"SOCKET=\"inet:8891@localhost\""
, "/etc/opendkim.conf" `File.containsLines`
[ "KeyFile /etc/mail/dkim.key"
, "SubDomains yes"
, "Domain *"
, "Selector mail"
]
, File.hasPrivContent "/etc/mail/dkim.key" (Context "kitenet.net")
, File.ownerGroup "/etc/mail/dkim.key" "opendkim" "opendkim"
]
`onChange` Service.restarted "opendkim"
-- Configures postfix to have the dkim milter, and no other milters. -- Configures postfix to have the dkim milter, and no other milters.
dkimMilter :: Property dkimMilter :: Property
dkimMilter = Postfix.mainCfFile `File.containsLines` dkimMilter = Postfix.mainCfFile `File.containsLines`
@ -633,6 +615,25 @@ dkimMilter = Postfix.mainCfFile `File.containsLines`
`describe` "postfix dkim milter" `describe` "postfix dkim milter"
`onChange` Postfix.dedupMainCf `onChange` Postfix.dedupMainCf
`onChange` Postfix.reloaded `onChange` Postfix.reloaded
`requires` dkimInstalled
-- This does not configure postfix to use the dkim milter,
-- nor does it set up domainkey DNS.
dkimInstalled :: Property
dkimInstalled = propertyList "opendkim installed"
[ Apt.serviceInstalledRunning "opendkim"
, File.hasPrivContent "/etc/mail/dkim.key" (Context "kitenet.net")
, File.ownerGroup "/etc/mail/dkim.key" "opendkim" "opendkim"
, "/etc/default/opendkim" `File.containsLine`
"SOCKET=\"inet:8891@localhost\""
, "/etc/opendkim.conf" `File.containsLines`
[ "KeyFile /etc/mail/dkim.key"
, "SubDomains yes"
, "Domain *"
, "Selector mail"
]
]
`onChange` Service.restarted "opendkim"
-- This is the dkim public key, corresponding with /etc/mail/dkim.key -- This is the dkim public key, corresponding with /etc/mail/dkim.key
-- This value can be included in a domain's additional records to make -- This value can be included in a domain's additional records to make