summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config-joey.hs1
-rw-r--r--debian/changelog2
2 files changed, 2 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 4b8ec46c..bac02cc3 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -221,6 +221,7 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
-- Diatom has 500 mb of memory, so tune for that.
& JoeySites.obnamLowMem
& Apt.serviceInstalledRunning "swapspace"
+ & Cron.job "memory use logged" (Cron.Times "*/5 * * * *") "root" "/" "(date; free; ps --sort -rss axl | head -n10) >> /var/log/memory.log"
& Apt.serviceInstalledRunning "apache2"
& JoeySites.kitenetHttps
diff --git a/debian/changelog b/debian/changelog
index 0076087c..6bac1899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ propellor (2.1.0) UNRELEASED; urgency=medium
* Additional tor properties, including support for making relays,
and naming bridges, relays, etc.
* New Cron.Times data type, which allows Cron.job to install
- * daily/monthly/weekly jobs that anacron can run. (API change)
+ daily/monthly/weekly jobs that anacron can run. (API change)
-- Joey Hess <id@joeyh.name> Thu, 29 Jan 2015 01:41:07 -0400