cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2015-02-10 21:39:16 -04:00
parent a56cf87df9
commit f5c82083fe
Failed to extract signature
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config-joey.hs
View File

@ -241,15 +241,10 @@ diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"
-- & alias "git.joeyh.name" -- & alias "git.joeyh.name"
-- & JoeySites.gitServer hosts -- & JoeySites.gitServer hosts
& JoeySites.downloads hosts -- & JoeySites.downloads hosts
& JoeySites.gitAnnexDistributor -- & JoeySites.gitAnnexDistributor
& JoeySites.annexWebSite "/srv/git/joey/tmp.git" & JoeySites.tmp
"tmp.kitenet.net"
"26fd6e38-1226-11e2-a75f-ff007033bdba"
[]
& JoeySites.twitRss
& JoeySites.pumpRss
& JoeySites.annexWebSite "/srv/git/user-liberation.git" & JoeySites.annexWebSite "/srv/git/user-liberation.git"
"user-liberation.joeyh.name" "user-liberation.joeyh.name"

25
src/Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -208,7 +208,7 @@ annexWebSite origin hn uuid remotes = propertyList (hn ++" website using git-ann
setup = userScriptProperty "joey" setupscript setup = userScriptProperty "joey" setupscript
setupscript = setupscript =
[ "cd " ++ shellEscape dir [ "cd " ++ shellEscape dir
, "git config annex.uuid " ++ shellEscape uuid , "git annex reinit " ++ shellEscape uuid
] ++ map addremote remotes ++ ] ++ map addremote remotes ++
[ "git annex get" [ "git annex get"
, "git update-server-info" , "git update-server-info"
@ -273,13 +273,6 @@ mainhttpscert True =
, " SSLCertificateChainFile /etc/ssl/certs/startssl.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 :: Property HasInfo
gitAnnexDistributor = combineProperties "git-annex distributor, including rsync server and signer" $ props gitAnnexDistributor = combineProperties "git-annex distributor, including rsync server and signer" $ props
& Apt.installed ["rsync"] & Apt.installed ["rsync"]
@ -299,6 +292,22 @@ gitAnnexDistributor = combineProperties "git-annex distributor, including rsync
, File.ownerGroup d "joey" "joey" , 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. -- Twitter, you kill us.
twitRss :: Property HasInfo twitRss :: Property HasInfo
twitRss = combineProperties "twitter rss" $ props twitRss = combineProperties "twitter rss" $ props