summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2015-02-10 22:34:27 -0400
committerJoey Hess2015-02-10 22:34:27 -0400
commitee3c6c06bc5745799de8e9c71228a554a3f69648 (patch)
treec7ef73eb961cb7e17502c06e0de4661b02a59433 /config-joey.hs
parentca2640d0371222ffade34044380a4086cb5917c4 (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 5139ab9b..d9dafd56 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -19,7 +19,6 @@ import qualified Propellor.Property.Dns as Dns
import qualified Propellor.Property.OpenId as OpenId
import qualified Propellor.Property.Docker as Docker
import qualified Propellor.Property.Git as Git
-import qualified Propellor.Property.Apache as Apache
import qualified Propellor.Property.Postfix as Postfix
import qualified Propellor.Property.Grub as Grub
import qualified Propellor.Property.Obnam as Obnam
@@ -27,7 +26,6 @@ import qualified Propellor.Property.Gpg as Gpg
import qualified Propellor.Property.Systemd as Systemd
import qualified Propellor.Property.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
import qualified Propellor.Property.HostingProvider.Linode as Linode
import qualified Propellor.Property.SiteSpecific.GitHome as GitHome
@@ -216,6 +214,8 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& Docker.garbageCollected `period` Daily
! Docker.docked oldusenetShellBox
+ & alias "nntp.olduse.net"
+ & alias "resources.olduse.net"
& JoeySites.oldUseNetServer hosts
& Dns.secondaryFor ["animx"] hosts "animx.eu.org"
@@ -259,8 +259,6 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
"da89f112-808b-420a-b468-d990ae2e5b52"
[]
- & alias "nntp.olduse.net"
- & alias "resources.olduse.net"
& JoeySites.oldUseNetServer hosts
& alias "ns2.kitenet.net"