propellor

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

commit 70c4e21b9c494f8e9ced93d89d76c099f86cc71e
parent 115eb123af739c8a5a56b3a81f4ff535d7392fc5
Author: rsiddharth <s@ricketyspace.net>
Date:   Fri,  5 Jan 2018 23:32:24 -0500

propellor spin

Diffstat:
config.hs | 37+++++++++++--------------------------
1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/config.hs b/config.hs @@ -43,7 +43,6 @@ import Propellor import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.Cron as Cron -import qualified Propellor.Property.Docker as Docker import qualified Propellor.Property.Fail2Ban as Fail2Ban import qualified Propellor.Property.File as File import qualified Propellor.Property.Nginx as Nginx @@ -64,7 +63,7 @@ hosts = [ cygnus, crux, ara ] cygnus :: Host cygnus = host "cygnus.ricketyspace.net" $ props & osDebian Unstable X86_64 - & File.hasContent "/etc/motd" (["", "At cygnus.", ""]) + & File.hasContent "/etc/motd" (["At cygnus."]) -- apt config. & Apt.stdSourcesList & Apt.unattendedUpgrades @@ -88,24 +87,22 @@ cygnus = host "cygnus.ricketyspace.net" $ props , "default-jdk" , "udisks2", "etckeeper", "acpi-support" , "ntp", "ntp-doc", "mosh", "dnsutils", "nscd" - , "nfs-kernel-server" , "nginx-full", "network-manager", "mailutils" , "postgresql", "postgresql-doc", "postgresql-client" , "alsa-utils", "pulseaudio" , "mpd", "mpc", "ncmpcpp", "mplayer" - , "texlive-full", "evince" + , "evince" , "htop" , "chromium", "w3m", "lynx", "torbrowser-launcher" - , "xbacklight", "redshift" + , "redshift" , "unzip", "zip" , "silversearcher-ag" , "weather-util", "weather-util-data" , "sudo", "debian-goodies", "debootstrap" , "aptitude" - , "systemd-container", "qemu", "docker-compose" + , "systemd-container" , "anarchism" ] - & Docker.installed -- s config. & User.accountFor (User "s") & User.hasLoginShell (User "s") "/usr/bin/zsh" @@ -161,7 +158,7 @@ sourceCygnusEnv cmd = ". $HOME/.env; " ++ cmd --- backup paths. ---- chum. chumFilter :: [Char] -chumFilter = "/home/s/v/git/rsd/dotfiles/rsync-backup/filter-chum" +chumFilter = "/home/s/v/git/s/dp/rsync-backup/filter-chum" chumBackupPath :: [Char] chumBackupPath = "/media/s/chum" @@ -171,7 +168,7 @@ chumAnnexPath = "/media/s/chum/annex/" ---- entisol. entisolFilter :: [Char] -entisolFilter = "/home/s/v/git/rsd/dotfiles/rsync-backup/filter-entisol" +entisolFilter = "/home/s/v/git/s/dp/rsync-backup/filter-entisol" entisolBackupPath :: [Char] entisolBackupPath = "/home/s/.mnt/entisol/box/cygnus/latest/" @@ -184,7 +181,7 @@ pgDumpsDir = "/home/s/.mnt/entisol/box/cygnus/pgdumps" ---- crux. cruxFilter :: [Char] -cruxFilter = "/home/s/v/git/rsd/dotfiles/rsync-backup/filter-crux" +cruxFilter = "/home/s/v/git/s/dp/rsync-backup/filter-crux" cruxBackupPath :: [Char] cruxBackupPath = "/home/s/.mnt/entisol/box/crux/latest/" @@ -294,7 +291,7 @@ buildEmacs = Cron.job "build-emacs" installEmacs :: Property DebianLike installEmacs = Cron.job "install-emacs" (Cron.Times "00 14 * * 6") - (User "root") "/home/s/v/git/others/emacs" cmd + (User "root") "/home/s/v/git/o/emacs" cmd where cmd = "make install" @@ -364,7 +361,7 @@ cygnusNginx = [ ,"server {" ," ssi on;" ," server_name vm.web;" - ," root /home/s/v/git/rsd/v-page;" + ," root /home/s/v/git/s/v-page;" ," index index.php index.html;" , "" ," location / {" @@ -384,7 +381,7 @@ cygnusNginx = [ ,"### rsd server" ,"server {" ," server_name rsd.web;" - ," root /home/s/v/git/rsd/rsd-w3;" + ," root /home/s/v/git/s/rsd-w3;" ," index index.html;" , "" ," location / {" @@ -406,7 +403,7 @@ cygnusNginx = [ ,"### ricketyspace server" ,"server {" ," server_name rs.web;" - ," root /home/s/v/git/rsd/rs;" + ," root /home/s/v/git/s/rs;" ," index index.html;" , "" ," location / {" @@ -523,7 +520,6 @@ cygnusSudoers = [ ,"# User alias specification" ,"User_Alias CRYPTERS = s" ,"User_Alias SANDBOXERS = s" - ,"User_Alias VAGRANTS = s" ,"User_Alias SUPER_COWS = s" , "" ,"# Cmnd alias specification" @@ -532,16 +528,6 @@ cygnusSudoers = [ ,"Cmnd_Alias SANDBOX = /usr/sbin/debootstrap, /usr/bin/systemd-nspawn, \\" ," /bin/machinectl" , "" - , "# Vagrant command alias specification" - , "Cmnd_Alias VAGRANT_EXPORTS_CHOWN = /bin/chown 0\\:0 /tmp/*" - , "Cmnd_Alias VAGRANT_EXPORTS_MV = /bin/mv -f /tmp/* /etc/exports" - , "Cmnd_Alias VAGRANT_NFSD_CHECK = /bin/systemctl status nfs-kernel-server" - , "Cmnd_Alias VAGRANT_NFSD_START = /bin/systemctl start nfs-kernel-server" - , "Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar" - , "Cmnd_Alias VAGRANT = VAGRANT_EXPORTS_CHOWN, VAGRANT_EXPORTS_MV, \\" - , " VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, \\" - , " VAGRANT_NFSD_APPLY" - , "" ,"# User privilege specification" ,"root ALL=(ALL:ALL) ALL" , "" @@ -551,7 +537,6 @@ cygnusSudoers = [ , "" ,"CRYPTERS ALL = NOPASSWD: CRYPT " ,"SANDBOXERS ALL = NOPASSWD: SANDBOX" - ,"VAGRANTS ALL = NOPASSWD: VAGRANT" ] cygnusNetworkManager :: [File.Line]