summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2017-04-09 15:00:33 -0400
committerJoey Hess2017-04-09 15:00:48 -0400
commit4ba09ab6844cc3fc3e94856da22190555b697193 (patch)
tree05e4bede709b56c79ca36e2c942a817415b20a59 /joeyconfig.hs
parentb61b77941f3774e6d7373bab9607b70f4acbd7e0 (diff)
added Propellor.Property.Bootstrap (untested)
This commit was sponsored by Jake Vosloo on Patreon.
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index e73897b4..036c2c92 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -38,6 +38,7 @@ import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuil
import qualified Propellor.Property.SiteSpecific.Branchable as Branchable
import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites
import Propellor.Property.DiskImage
+import Propellor.Property.Bootstrap
main :: IO () -- _ ______`| ,-.__
main = defaultMain hosts -- / \___-=O`/|O`/__| (____.'
@@ -93,7 +94,7 @@ darkstar = host "darkstar.kitenet.net" $ props
[ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@darkstar")
]
- ! imageBuilt "/tmp/img" c MSDOS (grubBooted PC)
+ & imageBuilt "/tmp/img" c MSDOS (grubBooted PC)
[ partition EXT2 `mountedAt` "/boot"
`setFlag` BootFlag
, partition EXT4 `mountedAt` "/"
@@ -106,6 +107,7 @@ darkstar = host "darkstar.kitenet.net" $ props
& Hostname.setTo "demo"
& Apt.installed ["linux-image-amd64"]
& User "root" `User.hasInsecurePassword` "root"
+ & bootstrappedFrom GitRepoOutsideChroot
gnu :: Host
gnu = host "gnu.kitenet.net" $ props