diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-05 14:03:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-05 14:03:07 -0400 |
| commit | 9d6c50fff28ed5ba7da7fdd2989c7773e357a3c3 (patch) | |
| tree | 6fba6644518aecd6fedfde5c42fbe01783f37aab /joeyconfig.hs | |
| parent | 05b0648e0be87700ecd7ce3a36c966aa96beff7b (diff) | |
| parent | e77e60604ac908e0895af202e83a47096d60b059 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'joeyconfig.hs')
| -rw-r--r-- | joeyconfig.hs | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index 695291d0..1befeb1a 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -47,6 +47,7 @@ main = defaultMain hosts -- / \___-=O`/|O`/__| (____.' hosts :: [Host] -- * \ | | '--------' hosts = -- (o) ` [ darkstar + , demo , gnu , dragon , clam @@ -88,26 +89,31 @@ darkstar = host "darkstar.kitenet.net" $ props & JoeySites.dkimMilter & JoeySites.postfixSaslPasswordClient - & JoeySites.alarmClock "*-*-* 7:30" (User "joey") - "/usr/bin/timeout 45m /home/joey/bin/goodmorning" + -- & JoeySites.alarmClock "*-*-* 7:30" (User "joey") + -- "/usr/bin/timeout 45m /home/joey/bin/goodmorning" & Ssh.userKeys (User "joey") hostContext [ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@darkstar") ] - & imageBuilt "/srv/propellor-disk.img" c MSDOS (grubBooted PC) + & imageBuilt "/srv/propellor-disk.img" + (Chroot.hostChroot demo (Chroot.Debootstrapped mempty)) + MSDOS (grubBooted PC) [ partition EXT2 `mountedAt` "/boot" `setFlag` BootFlag , partition EXT4 `mountedAt` "/" `mountOpt` errorReadonly , swapPartition (MegaBytes 256) ] - where - c d = Chroot.debootstrapped mempty d $ props - & osDebian Unstable X86_64 - & Hostname.setTo "demo" - & Apt.installed ["linux-image-amd64"] - & User "root" `User.hasInsecurePassword` "root" - & bootstrappedFrom GitRepoOutsideChroot + +demo :: Host +demo = host "demo.kitenet.net" $ props + & osDebian Unstable X86_64 + & Hostname.setTo "demo" + & Apt.installed ["linux-image-amd64"] + & User "root" `User.hasInsecurePassword` "root" + & bootstrappedFrom GitRepoOutsideChroot + & Apt.installedMin ["task-desktop"] + & Apt.installed ["xfce4", "lightdm", "xfce4-terminal", "firefox"] gnu :: Host gnu = host "gnu.kitenet.net" $ props |