summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-10-09 13:14:14 -0400
committerJoey Hess2018-10-09 13:14:14 -0400
commit2e172efb9b2c231061378ae54c8fa3c223541b06 (patch)
tree992ed3c45779c496c8c7dcbbd2b074eb6906377a
parente6e0b8271727bd231a719157dc47bf28bc1f49ca (diff)
propellor spin
-rw-r--r--joeyconfig.hs10
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs7
2 files changed, 8 insertions, 9 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index b8a63911..91a18cee 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -288,7 +288,7 @@ kite = host "kite.kitenet.net" $ props
& alias "git.joeyh.name"
& JoeySites.gitServer hosts
- & JoeySites.downloads hosts
+ & JoeySites.downloads
& JoeySites.gitAnnexDistributor
& JoeySites.tmp
@@ -312,6 +312,9 @@ kite = host "kite.kitenet.net" $ props
& JoeySites.kgbServer
& Systemd.nspawned ancientKitenet
+
+ & alias "podcatcher.kitenet.net"
+ & JoeySites.podcatcher
& JoeySites.scrollBox
& alias "scroll.joeyh.name"
@@ -374,13 +377,10 @@ elephant = host "elephant.kitenet.net" $ props
& Apt.serviceInstalledRunning "swapspace"
& alias "eubackup.kitenet.net"
- & Apt.installed ["sshfs", "rsync", "borgbackup"]
+ -- & Apt.installed ["sshfs", "rsync", "borgbackup"]
& JoeySites.githubBackup
& JoeySites.rsyncNetBackup hosts
- & alias "podcatcher.kitenet.net"
- & JoeySites.podcatcher
-
-- & alias "znc.kitenet.net"
-- & JoeySites.ircBouncer
-- & alias "kgb.kitenet.net"
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index f170803d..f794566b 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -333,12 +333,11 @@ gitAnnexDistributor = combineProperties "git-annex distributor, including rsync
& File.dirExists d
& File.ownerGroup d (User "joey") (Group "joey")
-downloads :: [Host] -> Property (HasInfo + DebianLike)
-downloads hosts = annexWebSite "/srv/git/downloads.git"
+downloads :: Property (HasInfo + DebianLike)
+downloads = annexWebSite "/srv/git/downloads.git"
"downloads.kitenet.net"
"840760dc-08f0-11e2-8c61-576b7e66acfd"
- [("eubackup", "ssh://eubackup.kitenet.net/~/lib/downloads/")]
- `requires` Ssh.knownHost hosts "eubackup.kitenet.net" (User "joey")
+ []
tmp :: Property (HasInfo + DebianLike)
tmp = propertyList "tmp.joeyh.name" $ props