propellor

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

commit 3614bcb1abfb9338f8f09cc7f5df59b30ca81ae6
parent d7d00f69bfa877f615e36b98e133e1be7aa2ec14
Author: rsiddharth <s@ricketyspace.net>
Date:   Tue,  3 Apr 2018 01:05:22 +0000

propellor spin

Diffstat:
config.hs | 30++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/config.hs b/config.hs @@ -89,7 +89,7 @@ cygnus = host "cygnus.ricketyspace.net" $ props , "stumpwm", "i3lock" , "xfonts-terminus", "fonts-noto", "unifont" , "imagemagick", "inkscape", "gimp", "sane" - , "keychain", "parcimonie", "pass", "pinentry-gtk2" + , "parcimonie", "pass", "pinentry-gtk2" , "tomb", "wipe", "steghide" , "python-virtualenv", "python-pip" , "make", "make-doc", "gcc", "gcc-doc", "gcc-doc-base" @@ -134,7 +134,7 @@ cygnus = host "cygnus.ricketyspace.net" $ props & buildEmacs & installEmacs & wgetLinks - <!> cygnusPgDump + & cygnusPgDump -- chroots. & Chroot.provisioned cygnusEmacsBuilder -- containers. @@ -169,7 +169,12 @@ sourceCygnusEnv cmd = ". $HOME/.env; " ++ cmd --- backup paths. ---- entisol. mollisolFilter :: [Char] -mollisolFilter = "/home/s/v/cygnus.ricketyspace.net/dp/rsync-backup/filter-mollisol" +mollisolFilter = "/home/s/v/cygnus.ricketyspace.net/" + ++ "dp/rsync-backup/filter-mollisol" + +mollisolExcludeFilter :: [Char] +mollisolExcludeFilter = "/home/s/v/cygnus.ricketyspace.net/" + ++ "dp/rsync-backup/filter-mollisol-exclude" mollisolBackupPath :: [Char] mollisolBackupPath = "/media/mollisol/box/cygnus/latest/" @@ -188,10 +193,14 @@ cruxBackupPath :: [Char] cruxBackupPath = "/media/mollisol/box/crux/latest/" ---- scripts. -rsyncBuTo :: [Char] -> [Char] -> [Char] -> [Char] -rsyncBuTo rbtFilter src dest = "./rsync-bu-to " - ++ rbtFilter ++ " " ++ src ++ " " ++ - dest +rsyncBuTo :: [Char] -> [Char] -> [Char] -> [Char] -> [Char] +rsyncBuTo src dest rbtFilter rbtExcludeFilter = concat [ + "./rsync-bu-to " + , src, " " + , dest, " " + , rbtFilter, " " + , rbtExcludeFilter + ] annexTo :: [Char] -> [Char] -> [Char] annexTo annexPath annexGetPath = "./annex-to " @@ -202,15 +211,16 @@ rsyncToMollisol :: Property DebianLike rsyncToMollisol = Cron.job "rsync-to-mollisol" (Cron.Times "00 03 * * *") (User "s") "/home/s/.bin" rsyncCmd where - rsyncCmd = rsyncBuTo mollisolFilter "/home/s" mollisolBackupPath + rsyncCmd = rsyncBuTo "/home/s" mollisolBackupPath + mollisolFilter mollisolExcludeFilter 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 "s@crux:~/" - cruxBackupPath) + rsyncCmd = sourceCygnusEnv (rsyncBuTo "s@crux:~/" cruxBackupPath + cruxFilter "") annexToArdisol :: Property DebianLike annexToArdisol = Cron.job "annex-to-ardisol" (Cron.Times "45 03 * * *")