diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-02-10 21:55:39 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-10 21:55:39 -0400 |
| commit | a407af3f03b31ec653a21ba0e1db49389c68c246 (patch) | |
| tree | c0bbea8c96d8dfb1dd01e9ae5ede266d8bd50c88 /config-joey.hs | |
| parent | 8f813dc87548a88bb28c326745b0399c74e344d8 (diff) | |
propellor spin
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/config-joey.hs b/config-joey.hs index 99deef43..91daff08 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -174,8 +174,9 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64" & JoeySites.kiteMailServer & JoeySites.kitenetHttps - & Apache.multiSSL & JoeySites.legacyWebSites + & File.ownerGroup "/srv/web" "joey" "joey" + & Apt.installed ["analog"] & alias "git.kitenet.net" & alias "git.joeyh.name" @@ -214,6 +215,8 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64" & Docker.configured & Docker.garbageCollected `period` Daily ! Docker.docked oldusenetShellBox + + & JoeySites.oldUseNetServer hosts diatom :: Host diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64" @@ -224,21 +227,21 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64" , (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA2QAJEuvbTmaN9ex9i9bjPhMGj+PHUYq2keIiaIImJ+8mo+yKSaGUxebG4tpuDPx6KZjdycyJt74IXfn1voGUrfzwaEY9NkqOP3v6OWTC3QeUGqDCeJ2ipslbEd9Ep9XBp+/ldDQm60D0XsIZdmDeN6MrHSbKF4fXv1bqpUoUILk=") ] - & DigitalOcean.distroKernel - & Apt.unattendedUpgrades - & Apt.serviceInstalledRunning "ntp" - & Postfix.satellite + -- & DigitalOcean.distroKernel + -- & Apt.unattendedUpgrades + -- & Apt.serviceInstalledRunning "ntp" + -- & Postfix.satellite -- Diatom has 500 mb of memory, so tune for that. - & JoeySites.obnamLowMem + -- & 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" + -- & 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 - & Apache.multiSSL - & File.ownerGroup "/srv/web" "joey" "joey" - & Apt.installed ["analog"] + -- & JoeySites.kitenetHttps + -- & Apache.multiSSL + -- & File.ownerGroup "/srv/web" "joey" "joey" + -- & Apt.installed ["analog"] -- & alias "git.kitenet.net" -- & alias "git.joeyh.name" |