From 185e4cfd08e6c3650de0fad7430d420c051e97f4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 14 Mar 2018 12:45:02 -0400 Subject: propellor spin --- joeyconfig.hs | 1 + src/Propellor/Property/Laptop.hs | 4 ++++ src/Propellor/Property/SiteSpecific/JoeySites.hs | 1 + 3 files changed, 6 insertions(+) diff --git a/joeyconfig.hs b/joeyconfig.hs index 23da8bb4..86233892 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -90,6 +90,7 @@ darkstar = host "darkstar.kitenet.net" $ props & Hostname.sane & Apt.serviceInstalledRunning "swapspace" & Laptop.powertopAutoTuneOnBoot + & Laptop.trimSSD & Grub.cmdline_Linux_default "i915.enable_psr=1" ! Grub.cmdline_Linux_default "quiet" diff --git a/src/Propellor/Property/Laptop.hs b/src/Propellor/Property/Laptop.hs index a36bda18..40b3adb9 100644 --- a/src/Propellor/Property/Laptop.hs +++ b/src/Propellor/Property/Laptop.hs @@ -26,3 +26,7 @@ powertopAutoTuneOnBoot = setup undo `requires` check (doesFileExist servicefile) (Systemd.disabled "powertop") servicefile = "/etc/systemd/system/powertop.service" + +-- | Enables weekly TRIM for SSDs, using systemd's fstrim.timer, +trimSSD :: Property Linux +trimSSD = Systemd.enabled "fstrim.timer" diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 0997401c..1f3ef169 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -636,6 +636,7 @@ dkimMilter = Postfix.mainCfFile `File.containsLines` `onChange` Postfix.dedupMainCf `onChange` Postfix.reloaded `requires` dkimInstalled + `requires` Postfix.installed -- This does not configure postfix to use the dkim milter, -- nor does it set up domainkey DNS. -- cgit v1.2.3