cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2015-01-21 23:22:42 -04:00
parent fa66cb49d6
commit a37e0a6bc3
Failed to extract signature
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config-joey.hs
View File

@ -25,6 +25,7 @@ import qualified Propellor.Property.Grub as Grub
import qualified Propellor.Property.Obnam as Obnam import qualified Propellor.Property.Obnam as Obnam
import qualified Propellor.Property.Gpg as Gpg import qualified Propellor.Property.Gpg as Gpg
import qualified Propellor.Property.Systemd as Systemd 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.OS as OS
import qualified Propellor.Property.HostingProvider.DigitalOcean as DigitalOcean import qualified Propellor.Property.HostingProvider.DigitalOcean as DigitalOcean
import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost
@ -145,7 +146,7 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& Systemd.installed & Systemd.installed
& Systemd.persistentJournal & Systemd.persistentJournal
& Systemd.journaldConfigured "SystemMaxUse" "500M" & Journald.systemMaxUse "500MiB"
& Ssh.passwordAuthentication True & Ssh.passwordAuthentication True
-- Since ssh password authentication is allowed: -- Since ssh password authentication is allowed:
& Apt.serviceInstalledRunning "fail2ban" & Apt.serviceInstalledRunning "fail2ban"

3
src/Propellor/Property/Systemd/Journald.hs
View File

@ -1,7 +1,6 @@
module Propellor.Property.Systemd.Journald where module Propellor.Property.Systemd.Journald where
import Propellor import Propellor
import qualified Propellor.Property.Systemd as Systemd import qualified Propellor.Property.Systemd as Systemd
import qualified Propellor.Property.File as File
import Utility.DataUnits import Utility.DataUnits
-- | Configures journald, restarting it so the changes take effect. -- | Configures journald, restarting it so the changes take effect.
@ -39,7 +38,7 @@ runtimeMaxFileSize = configuredSize "RuntimeMaxFileSize"
-- Generates size units as used in journald.conf. -- Generates size units as used in journald.conf.
systemdSizeUnits :: Integer -> String systemdSizeUnits :: Integer -> String
systemdSizeUnits n = filter (/= ' ') (roughSize cfgfileunits True n) systemdSizeUnits sz = filter (/= ' ') (roughSize cfgfileunits True sz)
where where
cfgfileunits :: [Unit] cfgfileunits :: [Unit]
cfgfileunits = cfgfileunits =