summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-12-05 16:23:07 -0400
committerJoey Hess2014-12-05 16:23:07 -0400
commitdbc76b1e5225a28b84efa14659ff1c0c1d5fc463 (patch)
tree1a3f95f33ded5798987ab02cd851d8ec7ea24cfa /config-joey.hs
parenta380ea8390984afa28c2956fc9a6e011a1b93763 (diff)
parent2559b2348207ed9e914999e92fe9d26da0e1f5ad (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs19
1 files changed, 14 insertions, 5 deletions
diff --git a/config-joey.hs b/config-joey.hs
index b617ccfa..b41af4a2 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -54,11 +54,20 @@ hosts = -- (o) `
testvm :: Host
testvm = host "testvm.kitenet.net"
- & Chroot.provisioned (Chroot.debootstrapped (System (Debian Unstable) "amd64") Debootstrap.DefaultConfig "/new-os")
- -- & OS.cleanInstall (OS.Confirmed "foo.example.com") []
- -- `onChange` propertyList "fixing up after clean install"
- -- [
- -- ]
+ & os (System (Debian Unstable) "amd64")
+ & OS.cleanInstallOnce (OS.Confirmed "testvm.kitenet.net")
+ `onChange` propertyList "fixing up after clean install"
+ [ User.shadowConfig True
+ , OS.preserveRootSshAuthorized
+ , OS.preserveResolvConf
+ , Apt.update
+ , Grub.boots "/dev/sda"
+ `requires` Grub.installed Grub.PC
+ ]
+ & Hostname.sane
+ & Hostname.searchDomain
+ & Apt.installed ["linux-image-amd64"]
+ & Apt.installed ["ssh"]
darkstar :: Host
darkstar = host "darkstar.kitenet.net"