summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2018-04-18 10:12:33 -0400
committerJoey Hess2018-04-18 10:12:33 -0400
commitf5c1cc7cd98208a780f27828ad6bd4864ec04af3 (patch)
tree799def00c4e67555ad2bda5d5425e100854654f1 /joeyconfig.hs
parent44580b7a10d6e4a21e17532c1b4c58e902f3a055 (diff)
parent487b7a616b8f74a789f42bea620e7ac17950c645 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs38
1 files changed, 14 insertions, 24 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 11f701ff..bba2072f 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -49,7 +49,6 @@ main = defaultMain hosts -- / \___-=O`/|O`/__| (____.'
hosts :: [Host] -- * \ | | '--------'
hosts = -- (o) `
[ darkstar
- , gnu
, dragon
, clam
, orca
@@ -64,25 +63,6 @@ hosts = -- (o) `
, keysafe
] ++ monsters
-testvm :: Host
-testvm = host "testvm.kitenet.net" $ props
- & osDebian Unstable X86_64
- & OS.cleanInstallOnce (OS.Confirmed "testvm.kitenet.net")
- `onChange` postinstall
- & Hostname.sane
- & Hostname.searchDomain
- & Apt.installed ["linux-image-amd64"]
- & Apt.installed ["ssh"]
- & User.hasPassword (User "root")
- where
- postinstall :: Property (HasInfo + DebianLike)
- postinstall = propertyList "fixing up after clean install" $ props
- & OS.preserveRootSshAuthorized
- & OS.preserveResolvConf
- & Apt.update
- & Grub.boots "/dev/sda"
- `requires` Grub.installed Grub.PC
-
darkstar :: Host
darkstar = host "darkstar.kitenet.net" $ props
& osDebian Unstable X86_64
@@ -106,10 +86,9 @@ darkstar = host "darkstar.kitenet.net" $ props
-- & imageBuiltFor honeybee
-- (RawDiskImage "/srv/honeybee.img")
-- (Debootstrapped mempty)
-
-gnu :: Host
-gnu = host "gnu.kitenet.net" $ props
- & Postfix.satellite
+ & imageBuiltFor banana
+ (RawDiskImage "/srv/banana.img")
+ (Debootstrapped mempty)
dragon :: Host
dragon = host "dragon.kitenet.net" $ props
@@ -182,6 +161,17 @@ orca = host "orca.kitenet.net" $ props
& Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer
(Cron.Times "1 1 * * *") "3h")
+banana :: Host
+banana = host "banana.kitenet.net" $ props
+ & lemaker_Banana_Pi
+ & hasPartition
+ ( partition EXT4
+ `mountedAt` "/"
+ `setSize` MegaBytes 950
+ )
+ & osDebian Testing ARMHF
+ & User.hasInsecurePassword (User "root") "root"
+
honeybee :: Host
honeybee = host "honeybee.kitenet.net" $ props
& standardSystem Testing ARMHF