summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2017-07-05 16:13:25 -0400
committerJoey Hess2017-07-05 16:13:25 -0400
commit9690f888ac37e9714a6d2e23f6bedd4ec9369328 (patch)
tree1fdbd079c2aefdfe81e960b492284b438d634273 /joeyconfig.hs
parent9d4531bc03a25bcf4a5f94c71e47bd4fbd419ca0 (diff)
propellor spin
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs10
1 files changed, 7 insertions, 3 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 26219386..ff16777c 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -22,6 +22,7 @@ import qualified Propellor.Property.Postfix as Postfix
import qualified Propellor.Property.Apache as Apache
import qualified Propellor.Property.LetsEncrypt as LetsEncrypt
import qualified Propellor.Property.LightDM as LightDM
+import qualified Propellor.Property.XFCE as XFCE
import qualified Propellor.Property.Grub as Grub
import qualified Propellor.Property.Obnam as Obnam
import qualified Propellor.Property.Gpg as Gpg
@@ -106,6 +107,7 @@ darkstar = host "darkstar.kitenet.net" $ props
`addFreeSpace` MegaBytes 256
, swapPartition (MegaBytes 256)
]
+ `before` File.ownerGroup "/srv/propellor-disk.img" (User "joey") (Group "joey")
demo :: Host
demo = host "demo.kitenet.net" $ props
@@ -113,11 +115,13 @@ demo = host "demo.kitenet.net" $ props
& Hostname.setTo "demo"
& Apt.installed ["linux-image-amd64"]
& bootstrappedFrom GitRepoOutsideChroot
- & Apt.installed ["task-desktop", "xfce4", "xfce4-terminal", "firefox"]
& User.accountFor user
- & LightDM.autoLogin user
- & user `User.hasInsecurePassword` "debian"
& root `User.hasInsecurePassword` "debian"
+ & user `User.hasInsecurePassword` "debian"
+ & XFCE.installedMin
+ & XFCE.defaultPanelFor user
+ & LightDM.autoLogin user
+ & Apt.installed ["firefox"]
where
user = User "user"
root = User "root"