From 5bd02bc9fccffdfe6072d855b8204cc806d1ccec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Dec 2017 18:34:58 -0400 Subject: propellor spin --- joeyconfig.hs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 5a3c7f7f..f54bd691 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -32,7 +32,6 @@ import qualified Propellor.Property.Gpg as Gpg import qualified Propellor.Property.Systemd as Systemd import qualified Propellor.Property.Journald as Journald import qualified Propellor.Property.Fail2Ban as Fail2Ban -import qualified Propellor.Property.Aiccu as Aiccu import qualified Propellor.Property.OS as OS import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost import qualified Propellor.Property.HostingProvider.Linode as Linode @@ -86,7 +85,7 @@ darkstar :: Host darkstar = host "darkstar.kitenet.net" $ props & osDebian Unstable X86_64 & ipv6 "2001:4830:1600:187::2" - & Aiccu.hasConfig "T18376" "JHZ2-SIXXS" + & Hostname.sane & User.nuked (User "nosuchuser") User.YesReallyDeleteHome @@ -97,9 +96,9 @@ darkstar = host "darkstar.kitenet.net" $ props & Ssh.userKeys (User "joey") hostContext [ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@darkstar") ] - & imageBuiltFor honeybee - (RawDiskImage "/srv/honeybee.img") - (Debootstrapped mempty) + -- & imageBuiltFor honeybee + -- (RawDiskImage "/srv/honeybee.img") + -- (Debootstrapped mempty) gnu :: Host gnu = host "gnu.kitenet.net" $ props -- cgit v1.2.3