From e32408f4e874708d560524b6fb7af74a4096b821 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jun 2014 13:07:31 -0400 Subject: propellor spin --- config-joey.hs | 19 +++++++++++++------ src/Propellor/Property/SiteSpecific/JoeySites.hs | 8 ++++++++ 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" + ] -- cgit v1.2.3