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

propellor spin

This commit is contained in:
Joey Hess 2014-07-18 12:48:08 -04:00
parent ad80a1600d
commit 1143ca7c5c
Failed to extract signature
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-joey.hs
View File

@ -102,7 +102,9 @@ hosts = -- (o) `
`requires` Gpg.keyImported "98147487" "root" `requires` Gpg.keyImported "98147487" "root"
`requires` Ssh.keyImported SshRsa "root" `requires` Ssh.keyImported SshRsa "root"
(Context "kite.kitenet.net") (Context "kite.kitenet.net")
& JoeySites.kiteMailServer & JoeySites.kiteMailServer
-- & alias "smtp.kitenet.net" -- not yet live!
& Apt.installed ["mutt", "alpine", "git-annex", "myrepos"] & Apt.installed ["mutt", "alpine", "git-annex", "myrepos"]
-- Since password authentication is allowed: -- Since password authentication is allowed:

4
src/Propellor/Property/Hostname.hs
View File

@ -9,6 +9,8 @@ import Data.List
-- --
-- Configures /etc/hostname and the current hostname. -- Configures /etc/hostname and the current hostname.
-- --
-- Configures /etc/mailname with the domain part of the hostname.
--
-- /etc/hosts is also configured, with an entry for 127.0.1.1, which is -- /etc/hosts is also configured, with an entry for 127.0.1.1, which is
-- standard at least on Debian to set the FDQN. -- standard at least on Debian to set the FDQN.
-- --
@ -31,6 +33,8 @@ setTo hn = combineProperties desc go
else Just $ trivial $ hostsline "127.0.1.1" [hn, basehost] else Just $ trivial $ hostsline "127.0.1.1" [hn, basehost]
, Just $ trivial $ hostsline "127.0.0.1" ["localhost"] , Just $ trivial $ hostsline "127.0.0.1" ["localhost"]
, Just $ trivial $ cmdProperty "hostname" [basehost] , Just $ trivial $ cmdProperty "hostname" [basehost]
, Just $ "/etc/mailname" `File.hasContent`
[if null domain then hn else domain]
] ]
hostsline ip names = File.fileProperty desc hostsline ip names = File.fileProperty desc