propellor

propellor config for hosts.
git clone git://git.ricketyspace.net/propellor.git
Log | Files | Refs | LICENSE

commit 6c590978cc0f2f815f6d7e38009bcdba9b319c49
parent b32e60386e9d666a084fc746bd857e12b46f116f
Author: rsiddharth <s@ricketyspace.net>
Date:   Mon,  2 Apr 2018 04:28:31 +0000

propellor spin

Diffstat:
config.hs | 58++++++++++++++++++++++------------------------------------
1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/config.hs b/config.hs @@ -123,13 +123,11 @@ cygnus = host "cygnus.ricketyspace.net" $ props & Ssh.userKeyAt (Just sCanonicalSshKeyPath) (User "s") hostContext (SshRsa, sCanonicalSshPubKey) --- crons. - & rsyncToEntisol - & rsyncFromCruxToEntisol - & annexToEntisol + & rsyncToMollisol + & rsyncFromCruxToMollisol + & annexToArdisol & annexSyncFromHome & updateGitAnnex - & twentyNoise - & twentyTwoNoise & getCruxEtc & autoCommitCygnusRepos & removeEmptyHomeDirs @@ -170,14 +168,14 @@ sourceCygnusEnv cmd = ". $HOME/.env; " ++ cmd --- backup paths. ---- entisol. -entisolFilter :: [Char] -entisolFilter = "/home/s/v/cygnus.ricketyspace.net/dp/rsync-backup/filter-entisol" +mollisolFilter :: [Char] +mollisolFilter = "/home/s/v/cygnus.ricketyspace.net/dp/rsync-backup/filter-mollisol" -entisolBackupPath :: [Char] -entisolBackupPath = "/home/s/.mnt/entisol/box/cygnus/latest/" +mollisolBackupPath :: [Char] +mollisolBackupPath = "/media/mollisol/box/cygnus/latest/" -entisolAnnexPath :: [Char] -entisolAnnexPath = "/home/s/.mnt/entisol/annex" +ardisolAnnexPath :: [Char] +ardisolAnnexPath = "/media/ardisol/annex" pgDumpsDir :: [Char] pgDumpsDir = "/home/s/.pgdumps" @@ -187,7 +185,7 @@ cruxFilter :: [Char] cruxFilter = "/home/s/v/cygnus.ricketyspace.net/dp/rsync-backup/filter-crux" cruxBackupPath :: [Char] -cruxBackupPath = "/home/s/.mnt/entisol/box/crux/latest/" +cruxBackupPath = "/media/mollisol/box/crux/latest/" ---- scripts. rsyncBuTo :: [Char] -> [Char] -> [Char] -> [Char] @@ -200,25 +198,25 @@ annexTo annexPath annexGetPath = "./annex-to " ++ annexPath ++ " " ++ annexGetPath ---- s's crons on cygnus. -rsyncToEntisol :: Property DebianLike -rsyncToEntisol = Cron.job "rsync-to-entisol" (Cron.Times "00 02 * * *") +rsyncToMollisol :: Property DebianLike +rsyncToMollisol = Cron.job "rsync-to-mollisol" (Cron.Times "00 03 * * *") (User "s") "/home/s/.bin" rsyncCmd where - rsyncCmd = rsyncBuTo entisolFilter "/home/s" entisolBackupPath + rsyncCmd = rsyncBuTo mollisolFilter "/home/s" mollisolBackupPath -rsyncFromCruxToEntisol :: Property DebianLike -rsyncFromCruxToEntisol = Cron.job "rsync-from-crux-to-entisol" - (Cron.Times "15 22 * * *") +rsyncFromCruxToMollisol :: Property DebianLike +rsyncFromCruxToMollisol = Cron.job "rsync-from-crux-to-mollisol" + (Cron.Times "30 03 * * *") (User "s") "/home/s/.bin" rsyncCmd where - rsyncCmd = sourceCygnusEnv (rsyncBuTo cruxFilter "rspace:~/" + rsyncCmd = sourceCygnusEnv (rsyncBuTo cruxFilter "s@crux:~/" cruxBackupPath) -annexToEntisol :: Property DebianLike -annexToEntisol = Cron.job "annex-to-entisol" (Cron.Times "45 02 * * *") +annexToArdisol :: Property DebianLike +annexToArdisol = Cron.job "annex-to-ardisol" (Cron.Times "45 03 * * *") (User "s") "/home/s/.bin" annexCmd where - annexCmd = annexTo entisolAnnexPath "." + annexCmd = annexTo ardisolAnnexPath "." annexSyncFromHome :: Property DebianLike annexSyncFromHome = Cron.job "annex-sync-from-home" @@ -233,18 +231,6 @@ updateGitAnnex = Cron.job "update-git-annex" (Cron.Times "20 22 * * 1") where makeCmd = "make git-annex" -twentyNoise :: Property DebianLike -twentyNoise = Cron.job "twenty-noise" (Cron.Times "00 20 * * *") - (User "s") "/home/s" noiseCmd - where - noiseCmd = "mpc play" - -twentyTwoNoise :: Property DebianLike -twentyTwoNoise = Cron.job "twenty-two-noise" (Cron.Times "00 22 * * *") - (User "s") "/home/s" noiseCmd - where - noiseCmd = "mpc play" - getCruxEtc :: Property DebianLike getCruxEtc = Cron.job "get-crux-etc" (Cron.Times "20 22 * * *") (User "s") "/home/s/v/cygnus.ricketyspace.net/crux-etc" gitCmd @@ -253,7 +239,7 @@ getCruxEtc = Cron.job "get-crux-etc" (Cron.Times "20 22 * * *") autoCommitCygnusRepos :: Property DebianLike autoCommitCygnusRepos = Cron.job "auto-commit-repos" - (Cron.Times "20 22 * * *") + (Cron.Times "20 00 * * *") (User "s") "/home/s/.bin/" autoCommitCmd where autoCommitCmd = sourceCygnusEnv "./git-difme" @@ -282,7 +268,7 @@ installEmacs = Cron.job "install-emacs" wgetLinks :: Property DebianLike wgetLinks = Cron.job "wgetLinks" - (Cron.Times "15 22 * * *") + (Cron.Times "15 02 * * *") (User "s") "/home/s/.bin/" cmd where cmd = "./cache-webs"