From 1d96b87f02a80a35bc1e90a3ccdfaea346e3b179 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Apr 2018 16:15:51 -0400 Subject: propellor spin --- joeyconfig.hs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/joeyconfig.hs b/joeyconfig.hs index 11f701ff..a08accf7 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -106,6 +106,9 @@ darkstar = host "darkstar.kitenet.net" $ props -- & imageBuiltFor honeybee -- (RawDiskImage "/srv/honeybee.img") -- (Debootstrapped mempty) + & imageBuiltFor banana + (RawDiskImage "/srv/banana.img") + (Debootstrapped mempty) gnu :: Host gnu = host "gnu.kitenet.net" $ props @@ -182,6 +185,17 @@ orca = host "orca.kitenet.net" $ props & Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer (Cron.Times "1 1 * * *") "3h") +banana :: Host +banana = host "banana.kitenet.net" $ props + & standardSystem Testing ARMHF + [ "Banana pi dev board." ] + & lemaker_Banana_Pi + & hasPartition + ( partition EXT4 + `mountedAt` "/" + `setSize` MegaBytes 200 + ) + honeybee :: Host honeybee = host "honeybee.kitenet.net" $ props & standardSystem Testing ARMHF -- cgit v1.2.3 From bac669100524ce9a7a453de3f5d455e962e445aa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Apr 2018 17:22:37 -0400 Subject: I tested the banana pi earlier, forgot to move it to the tested section --- src/Propellor/Property/Machine.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- cgit v1.2.3 From 98369be818b40b32720b113e3bccc2343af9ad13 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Apr 2018 21:26:22 -0400 Subject: propellor spin --- joeyconfig.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index a08accf7..696e8488 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -187,14 +187,14 @@ orca = host "orca.kitenet.net" $ props banana :: Host banana = host "banana.kitenet.net" $ props - & standardSystem Testing ARMHF - [ "Banana pi dev board." ] & lemaker_Banana_Pi & hasPartition ( partition EXT4 `mountedAt` "/" - `setSize` MegaBytes 200 + `setSize` MegaBytes 800 ) + & osDebian Testing ARMHF + & User.hasInsecurePassword (User "root") "root" honeybee :: Host honeybee = host "honeybee.kitenet.net" $ props -- cgit v1.2.3 From 9957164685086ae7e97cff4e0bd20ea5ee2a18bd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Apr 2018 09:30:31 -0400 Subject: propellor spin --- joeyconfig.hs | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index 696e8488..7c859a81 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 @@ -110,10 +90,6 @@ darkstar = host "darkstar.kitenet.net" $ props (RawDiskImage "/srv/banana.img") (Debootstrapped mempty) -gnu :: Host -gnu = host "gnu.kitenet.net" $ props - & Postfix.satellite - dragon :: Host dragon = host "dragon.kitenet.net" $ props & ipv6 "2001:4830:1600:187::2" -- cgit v1.2.3 From 487b7a616b8f74a789f42bea620e7ac17950c645 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Apr 2018 13:05:51 -0400 Subject: propellor spin --- joeyconfig.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index 7c859a81..bba2072f 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -167,7 +167,7 @@ banana = host "banana.kitenet.net" $ props & hasPartition ( partition EXT4 `mountedAt` "/" - `setSize` MegaBytes 800 + `setSize` MegaBytes 950 ) & osDebian Testing ARMHF & User.hasInsecurePassword (User "root") "root" -- cgit v1.2.3