summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-01-21 23:22:42 -0400
committerJoey Hess2015-01-21 23:22:42 -0400
commita37e0a6bc3816bb85f1ebca7e0fd7a9bb2349b3a (patch)
treed78eb65584149b8f4a266aa03ae666b5a78683ec
parentfa66cb49d668ca065324530ced05b72de0499e34 (diff)
propellor spin
-rw-r--r--config-joey.hs3
-rw-r--r--src/Propellor/Property/Systemd/Journald.hs3
2 files changed, 3 insertions, 3 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 89e94192..cd401657 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 e852ebd9..978cd54d 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 =