summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-07-18 00:20:09 -0400
committerJoey Hess2014-07-18 00:20:09 -0400
commit5590c1c75a4207ab5ad3d02a2073f974b0b27add (patch)
tree0d76160523851c3cc21b33d36d230f619568324a /config-joey.hs
parent863cdf470b91fb284405f4b96910f32727da1281 (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 94869ddf..6db3e81d 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -63,7 +63,6 @@ hosts = -- (o) `
[ "Main git-annex build box." ]
& ipv4 "138.38.108.179"
- & Hostname.sane
& Apt.unattendedUpgrades
& Postfix.satellite
& Docker.configured
@@ -85,7 +84,6 @@ hosts = -- (o) `
& Apt.installed ["linux-image-amd64"]
& Linode.chainPVGrub 5
- & Hostname.sane
& Apt.unattendedUpgrades
& Apt.installed ["systemd"]
& Ssh.hostKeys (Context "kitenet.net")
@@ -110,7 +108,6 @@ hosts = -- (o) `
& ipv4 "107.170.31.195"
& DigitalOcean.distroKernel
- & Hostname.sane
& Ssh.hostKeys (Context "diatom.kitenet.net")
& Apt.unattendedUpgrades
& Apt.serviceInstalledRunning "ntp"
@@ -174,7 +171,6 @@ hosts = -- (o) `
& ipv4 "193.234.225.114"
& Grub.chainPVGrub "hd0,0" "xen/xvda1" 30
- & Hostname.sane
& Postfix.satellite
& Apt.unattendedUpgrades
& Ssh.hostKeys ctx
@@ -286,6 +282,8 @@ type Motd = [String]
standardSystem :: HostName -> DebianSuite -> Architecture -> Motd -> Host
standardSystem hn suite arch motd = host hn
& os (System (Debian suite) arch)
+ & Hostname.sane
+ & Hostname.searchDomain
& File.hasContent "/etc/motd" ("":motd++[""])
& Apt.stdSourcesList `onChange` Apt.upgrade
& Apt.cacheCleaned