From 03421d06b79dc4ab99586c79a002f19047a9ef4d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 25 Aug 2017 19:26:44 -0400 Subject: remove obnam repos setup property --- joeyconfig.hs | 1 - src/Propellor/Property/SiteSpecific/JoeySites.hs | 10 ---------- 2 files changed, 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" -- cgit v1.2.3