From 56a0503605c9cfb4d3f200747787d893062e445f Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 29 May 2018 15:11:55 -0400
Subject: propellor spin

---
 src/Propellor/Property/SiteSpecific/JoeySites.hs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/Propellor/Property')

diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index ceee7bf3..ff2fab79 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -920,6 +920,9 @@ homePower user hosts ctx sshkey = propertyList "home power" $ props
 	& Systemd.enabled setupservicename
 		`requires` setupserviceinstalled
 		`onChange` Systemd.started setupservicename
+	& Systemd.enabled watchdogservicename
+		`requires` watchdogserviceinstalled
+		`onChange` Systemd.started watchdogservicename
 	& Systemd.enabled pollerservicename
 		`requires` pollerserviceinstalled
 		`onChange` Systemd.started pollerservicename
@@ -991,6 +994,22 @@ homePower user hosts ctx sshkey = propertyList "home power" $ props
 		, "[Install]"
 		, "WantedBy=multi-user.target"
 		]
+	watchdogservicename = "homepower-watchdog"
+	watchdogservicefile = "/etc/systemd/system/" ++ watchdogservicename ++ ".service"
+	watchdogserviceinstalled = watchdogservicefile `File.hasContent`
+		[ "[Unit]"
+		, "Description=home power watchdog"
+		, ""
+		, "[Service]"
+		, "ExecStart=" ++ d ++ "/watchdog"
+		, "WorkingDirectory=" ++ d
+		, "User=root"
+		, "Group=root"
+		, "Restart=always"
+		, ""
+		, "[Install]"
+		, "WantedBy=multi-user.target"
+		]
 	setupservicename = "homepower-setup"
 	setupservicefile = "/etc/systemd/system/" ++ setupservicename ++ ".service"
 	setupserviceinstalled = setupservicefile `File.hasContent`
@@ -1126,6 +1145,7 @@ laptopSoftware = Apt.installed
 	, "w3m", "sm", "weechat"
 	, "borgbackup", "wipe", "smartmontools", "libgfshare-bin"
 	, "units"
+	, "virtualbox", "qemu-kvm"
 	]
 	`requires` baseSoftware
 	`requires` devSoftware
-- 
cgit v1.3-2-g0d8e


From 3ad941a960713a0d0ab13933c53408c220b2a6a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 1 Jun 2018 13:05:41 -0400
Subject: note about fix

---
 src/Propellor/Property/Qemu.hs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/Propellor/Property')

diff --git a/src/Propellor/Property/Qemu.hs b/src/Propellor/Property/Qemu.hs
index f204a0e1..a6e7e849 100644
--- a/src/Propellor/Property/Qemu.hs
+++ b/src/Propellor/Property/Qemu.hs
@@ -5,6 +5,11 @@ import qualified Propellor.Property.Apt as Apt
 
 -- | Installs qemu user mode emulation binaries, built statically,
 -- which allow foreign binaries to run directly.
+--
+-- Note that this is not necessary after qemu 2.12~rc3+dfsg-1.
+-- See http://bugs.debian.org/868030
+-- It's currently always done to support older versions, but
+-- could be skipped with the newer version.
 foreignBinariesEmulated :: RevertableProperty Linux Linux
 foreignBinariesEmulated = (setup <!> cleanup)
 	`describe` "foreign binary emulation"
-- 
cgit v1.3-2-g0d8e