summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Propellor/Property/SiteSpecific/JoeySites.hs17
-rw-r--r--config-joey.hs8
2 files changed, 18 insertions, 7 deletions
diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs
index 73a8f71f..2a6dffe4 100644
--- a/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -169,3 +169,20 @@ mainhttpscert True =
, " SSLCertificateKeyFile /etc/ssl/private/web.pem"
, " SSLCertificateChainFile /etc/ssl/certs/startssl.pem"
]
+
+
+annexRsyncServer :: Property
+annexRsyncServer = combineProperties "rsync server for git-annex autobuilders"
+ [ Apt.installed ["rsync"]
+ , File.hasPrivContent "/etc/rsyncd.conf"
+ , File.hasPrivContent "/etc/rsyncd.secrets"
+ , "/etc/default/rsync" `File.containsLine` "RSYNC_ENABLE=true"
+ `onChange` Service.running "rsync"
+ , endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild"
+ , endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks"
+ ]
+ where
+ endpoint d = combineProperties ("endpoint " ++ d)
+ [ File.dirExists d
+ , File.ownerGroup d "joey" "joey"
+ ]
diff --git a/config-joey.hs b/config-joey.hs
index 76860cb6..166e84e4 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -98,13 +98,7 @@ hosts = -- (o) `
"downloads.kitenet.net"
"840760dc-08f0-11e2-8c61-576b7e66acfd"
[("turtle", "ssh://turtle.kitenet.net/~/lib/downloads/")]
- -- rsync server for git-annex autobuilders
- & Apt.installed ["rsync"]
- & File.hasPrivContent "/etc/rsyncd.conf"
- & File.hasPrivContent "/etc/rsyncd.secrets"
- & "/etc/default/rsync" `File.containsLine` "RSYNC_ENABLE=true"
- `describe` "rsync server enabled"
- `onChange` Service.running "rsync"
+ & JoeySites.annexRsyncServer
& cname "tmp.kitenet.net"
& JoeySites.annexWebSite hosts "/srv/git/joey/tmp.git"