summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-06-01 13:07:31 -0400
committerJoey Hess2014-06-01 13:07:31 -0400
commite32408f4e874708d560524b6fb7af74a4096b821 (patch)
tree28a835222d24b2b3dcf6f7f7d0a11135d4b5977e
parentb9c868dd88c4160a800bd4ff9cce10f10f3092c3 (diff)
propellor spin
-rw-r--r--config-joey.hs19
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs8
2 files changed, 21 insertions, 6 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 55ce4765..587cbeef 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -171,12 +171,10 @@ hosts = -- (o) `
-- Joey gets pocasts here.
& Apt.installed ["git-annex"]
& alias "podcatcher.kitenet.net"
-
- -- Joey runs github-backup here.
- & Apt.installed ["github-backup", "moreutils"]
- & let f = "/home/joey/.github-keys"
- in File.hasPrivContent f
- `onChange` File.ownerGroup f "joey" "joey"
+
+ & JoeySites.githubBackup
+
+ & Docker.docked hosts "volatagex"
--' __|II| ,.
---- __|II|II|__ ( \_,/\
@@ -225,6 +223,15 @@ hosts = -- (o) `
, let gitannexdir = GitAnnexBuilder.homedir </> "git-annex"
in GitAnnexBuilder.androidContainer dockerImage "android-git-annex" doNothing gitannexdir
& Docker.volume ("/home/joey/src/git-annex:" ++ gitannexdir)
+
+ -- temp for an aqquantance
+ , standardContainer "voltagex" Stable "amd64"
+ & Docker.publish "22022:22"
+ & Apt.serviceInstalledRunning "ssh"
+ & Ssh.permitRootLogin True
+ & Ssh.passwordAuthentication True
+ & User.hasSomePassword "root"
+
] ++ monsters
-- This is my standard system setup.
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index f6e1e37f..b44401ea 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -330,3 +330,11 @@ kiteShellBox = propertyList "kitenet.net shellinabox"
`onChange` Service.restarted "shellinabox"
, Service.running "shellinabox"
]
+
+githubBackup :: Property
+githubBackup = propertyList "github-backup box"
+ [ Apt.installed ["github-backup", "moreutils"]
+ , let f = "/home/joey/.github-keys"
+ in File.hasPrivContent f
+ `onChange` File.ownerGroup f "joey" "joey"
+ ]