diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-17 15:54:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-17 15:54:32 -0400 |
| commit | c8feea04e107195b5f75acd207901d18f9757dc4 (patch) | |
| tree | 5dc46063dfee77e9a16903d9caac2e97c195c47c | |
| parent | 330c00efa4de9f927d5ce932bcbe6144f82dbcd9 (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs index 9295119c..14ceb109 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -131,7 +131,7 @@ hosts = -- (o) ` & JoeySites.gitServer hosts & alias "downloads.kitenet.net" - & JoeySites.annexWebSite hosts "/srv/git/downloads.git" + & JoeySites.annexWebSite "/srv/git/downloads.git" "downloads.kitenet.net" "840760dc-08f0-11e2-8c61-576b7e66acfd" [("turtle", "ssh://turtle.kitenet.net/~/lib/downloads/")] @@ -140,7 +140,7 @@ hosts = -- (o) ` & JoeySites.gitAnnexDistributor & alias "tmp.kitenet.net" - & JoeySites.annexWebSite hosts "/srv/git/joey/tmp.git" + & JoeySites.annexWebSite "/srv/git/joey/tmp.git" "tmp.kitenet.net" "26fd6e38-1226-11e2-a75f-ff007033bdba" [] diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index db9be1c2..14e3aa0e 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -191,8 +191,8 @@ gitServer hosts = propertyList "git.kitenet.net setup" type AnnexUUID = String -- | A website, with files coming from a git-annex repository. -annexWebSite :: [Host] -> Git.RepoUrl -> HostName -> AnnexUUID -> [(String, Git.RepoUrl)] -> Property -annexWebSite hosts origin hn uuid remotes = propertyList (hn ++" website using git-annex") +annexWebSite :: Git.RepoUrl -> HostName -> AnnexUUID -> [(String, Git.RepoUrl)] -> Property +annexWebSite origin hn uuid remotes = propertyList (hn ++" website using git-annex") [ Git.cloned "joey" origin dir Nothing `onChange` setup , postupdatehook `File.hasContent` |