summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-01-06 01:20:56 -0400
committerJoey Hess2015-01-06 01:20:56 -0400
commitf4a57ca27d2009b3069c6b33904d198e6aa73f79 (patch)
tree2a46bc46c39da40ec85c8fdc04017042920daf18
parentff7f70d2805f9f24655fd6a8e510419803658606 (diff)
refactor dns settings!
-rw-r--r--config-joey.hs3
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs1
2 files changed, 1 insertions, 3 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 03674318..d2dbbb6a 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -226,7 +226,6 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
& alias "git.joeyh.name"
& JoeySites.gitServer hosts
- & alias "downloads.kitenet.net"
& JoeySites.annexWebSite "/srv/git/downloads.git"
"downloads.kitenet.net"
"840760dc-08f0-11e2-8c61-576b7e66acfd"
@@ -235,7 +234,6 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
`requires` Ssh.knownHost hosts "eubackup.kitenet.net" "joey"
& JoeySites.gitAnnexDistributor
- & alias "tmp.kitenet.net"
& JoeySites.annexWebSite "/srv/git/joey/tmp.git"
"tmp.kitenet.net"
"26fd6e38-1226-11e2-a75f-ff007033bdba"
@@ -243,7 +241,6 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
& JoeySites.twitRss
& JoeySites.pumpRss
- & alias "user-liberation.joeyh.name"
& JoeySites.annexWebSite "/srv/git/user-liberation.git"
"user-liberation.joeyh.name"
"da89f112-808b-420a-b468-d990ae2e5b52"
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 75611f0d..3933262f 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -193,6 +193,7 @@ annexWebSite :: Git.RepoUrl -> HostName -> AnnexUUID -> [(String, Git.RepoUrl)]
annexWebSite origin hn uuid remotes = propertyList (hn ++" website using git-annex")
[ Git.cloned "joey" origin dir Nothing
`onChange` setup
+ , alias hn
, postupdatehook `File.hasContent`
[ "#!/bin/sh"
, "exec git update-server-info"