diff options
| -rw-r--r-- | joeyconfig.hs | 38 | ||||
| -rw-r--r-- | src/Propellor/Property/Machine.hs | 2 |
2 files changed, 15 insertions, 25 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 diff --git a/src/Propellor/Property/Machine.hs b/src/Propellor/Property/Machine.hs index 0fe172b5..698c7717 100644 --- a/src/Propellor/Property/Machine.hs +++ b/src/Propellor/Property/Machine.hs @@ -48,10 +48,10 @@ module Propellor.Property.Machine ( marvell_SheevaPlug, cubietech_Cubietruck, olimex_A10_OLinuXino_LIME, + lemaker_Banana_Pi, -- * ARM boards (untested) cubietech_Cubieboard, cubietech_Cubieboard2, - lemaker_Banana_Pi, lemaker_Banana_Pro, olimex_A10s_OLinuXino_Micro, olimex_A20_OLinuXino_LIME, |