From a37e0a6bc3816bb85f1ebca7e0fd7a9bb2349b3a Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 21 Jan 2015 23:22:42 -0400
Subject: [PATCH] propellor spin

---
 config-joey.hs                             | 3 ++-
 src/Propellor/Property/Systemd/Journald.hs | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config-joey.hs b/config-joey.hs
index 89e9419..cd40165 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -25,6 +25,7 @@ import qualified Propellor.Property.Grub as Grub
 import qualified Propellor.Property.Obnam as Obnam
 import qualified Propellor.Property.Gpg as Gpg
 import qualified Propellor.Property.Systemd as Systemd
+import qualified Propellor.Property.Systemd.Journald as Journald
 import qualified Propellor.Property.OS as OS
 import qualified Propellor.Property.HostingProvider.DigitalOcean as DigitalOcean
 import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost
@@ -145,7 +146,7 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
 	& Apt.unattendedUpgrades
 	& Systemd.installed
 	& Systemd.persistentJournal
-	& Systemd.journaldConfigured "SystemMaxUse" "500M"
+	& Journald.systemMaxUse "500MiB"
 	& Ssh.passwordAuthentication True
 	-- Since ssh password authentication is allowed:
 	& Apt.serviceInstalledRunning "fail2ban"
diff --git a/src/Propellor/Property/Systemd/Journald.hs b/src/Propellor/Property/Systemd/Journald.hs
index e852ebd..978cd54 100644
--- a/src/Propellor/Property/Systemd/Journald.hs
+++ b/src/Propellor/Property/Systemd/Journald.hs
@@ -1,7 +1,6 @@
 module Propellor.Property.Systemd.Journald where
 import Propellor
 import qualified Propellor.Property.Systemd as Systemd
-import qualified Propellor.Property.File as File
 import Utility.DataUnits
 
 -- | Configures journald, restarting it so the changes take effect.
@@ -39,7 +38,7 @@ runtimeMaxFileSize = configuredSize "RuntimeMaxFileSize"
 
 -- Generates size units as used in journald.conf.
 systemdSizeUnits :: Integer -> String
-systemdSizeUnits n = filter (/= ' ') (roughSize cfgfileunits True n)
+systemdSizeUnits sz = filter (/= ' ') (roughSize cfgfileunits True sz)
   where
 	cfgfileunits :: [Unit]
 	cfgfileunits =