summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config-joey.hs11
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs25
2 files changed, 20 insertions, 16 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 79d133d1..7ce893c0 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -241,15 +241,10 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
-- & alias "git.joeyh.name"
-- & JoeySites.gitServer hosts
- & JoeySites.downloads hosts
- & JoeySites.gitAnnexDistributor
+ -- & JoeySites.downloads hosts
+ -- & JoeySites.gitAnnexDistributor
- & JoeySites.annexWebSite "/srv/git/joey/tmp.git"
- "tmp.kitenet.net"
- "26fd6e38-1226-11e2-a75f-ff007033bdba"
- []
- & JoeySites.twitRss
- & JoeySites.pumpRss
+ & JoeySites.tmp
& JoeySites.annexWebSite "/srv/git/user-liberation.git"
"user-liberation.joeyh.name"
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 06608c6b..edca2aa4 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -208,7 +208,7 @@ annexWebSite origin hn uuid remotes = propertyList (hn ++" website using git-ann
setup = userScriptProperty "joey" setupscript
setupscript =
[ "cd " ++ shellEscape dir
- , "git config annex.uuid " ++ shellEscape uuid
+ , "git annex reinit " ++ shellEscape uuid
] ++ map addremote remotes ++
[ "git annex get"
, "git update-server-info"
@@ -272,13 +272,6 @@ mainhttpscert True =
, " SSLCertificateKeyFile /etc/ssl/private/web.pem"
, " SSLCertificateChainFile /etc/ssl/certs/startssl.pem"
]
-
-downloads :: [Host] -> Property HasInfo
-downloads hosts = 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" "joey"
gitAnnexDistributor :: Property HasInfo
gitAnnexDistributor = combineProperties "git-annex distributor, including rsync server and signer" $ props
@@ -299,6 +292,22 @@ gitAnnexDistributor = combineProperties "git-annex distributor, including rsync
, File.ownerGroup d "joey" "joey"
]
+downloads :: [Host] -> Property HasInfo
+downloads hosts = 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" "joey"
+
+tmp :: Property HasInfo
+tmp = propertyList "tmp.kitenet.net" $ props
+ & annexWebSite "/srv/git/joey/tmp.git"
+ "tmp.kitenet.net"
+ "26fd6e38-1226-11e2-a75f-ff007033bdba"
+ []
+ & twitRss
+ & pumpRss
+
-- Twitter, you kill us.
twitRss :: Property HasInfo
twitRss = combineProperties "twitter rss" $ props