summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-08-28 18:41:37 -0400
committerJoey Hess2017-08-28 18:41:37 -0400
commit1dd148946bd06056dec5d8ab8555a9f29826f2b7 (patch)
treee251c3b2dfe9079f3678bc2446396ba12d77b9f3
parentf8452ba63779f45d6424e151db7d61a6e6d10590 (diff)
parent03421d06b79dc4ab99586c79a002f19047a9ef4d (diff)
Merge branch 'joeyconfig'
-rw-r--r--joeyconfig.hs1
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs10
2 files changed, 0 insertions, 11 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 49480718..fb5f2995 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -374,7 +374,6 @@ elephant = host "elephant.kitenet.net" $ props
& alias "eubackup.kitenet.net"
& Apt.installed ["obnam", "sshfs", "rsync", "borgbackup"]
- & JoeySites.obnamRepos ["pell", "kite"]
& JoeySites.githubBackup
& JoeySites.rsyncNetBackup hosts
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 34b0af44..d4263031 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -440,16 +440,6 @@ backupsBackedupFrom hosts srchost destdir = Cron.niceJob desc
desc = "backups copied from " ++ srchost ++ " on boot"
cmd = "sleep 30m && rsync -az --bwlimit=300K --partial --delete " ++ srchost ++ ":lib/backup/ " ++ destdir </> srchost
-obnamRepos :: [String] -> Property UnixLike
-obnamRepos rs = propertyList ("obnam repos for " ++ unwords rs) $
- toProps (mkbase : map mkrepo rs)
- where
- mkbase = mkdir "/home/joey/lib/backup"
- `requires` mkdir "/home/joey/lib"
- mkrepo r = mkdir ("/home/joey/lib/backup/" ++ r ++ ".obnam")
- mkdir d = File.dirExists d
- `before` File.ownerGroup d (User "joey") (Group "joey")
-
podcatcher :: Property DebianLike
podcatcher = Cron.niceJob "podcatcher run hourly" (Cron.Times "55 * * * *")
(User "joey") "/home/joey/lib/sound/podcasts"