From 21658640fd1edf40e8ceb6d72994dfbdec9c8b99 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 25 Apr 2019 19:00:27 -0400 Subject: propellor spin --- joeyconfig.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index 97657ad7..44215eba 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -219,7 +219,8 @@ kite :: Host kite = host "kite.kitenet.net" $ props & standardSystemUnhardened Testing X86_64 [ "Welcome to kite!" ] & ipv4 "66.228.36.95" - & ipv6 "2600:3c03::f03c:91ff:fe73:b0d2" + -- routing problem with ipv6 currently + -- & ipv6 "2600:3c03::f03c:91ff:fe73:b0d2" & alias "kitenet.net" & Ssh.hostKeys (Context "kitenet.net") [ (SshDsa, "ssh-dss AAAAB3NzaC1kc3MAAACBAO9tnPUT4p+9z7K6/OYuiBNHaij4Nzv5YVBih1vMl+ALz0gYAj8RWJzXmqp5buFAyfgOoLw+H9s1bBS01Sy3i07Dm6cx1fWG4RXL/E/3w1tavX99GD2bBxDBu890ebA5Tp+eFRJkS9+JwSvFiF6CP7NbVjifCagoUO56Ig048RwDAAAAFQDPY2xM3q6KwsVQliel23nrd0rV2QAAAIEAga3hj1hL00rYPNnAUzT8GAaSP62S4W68lusErH+KPbsMwFBFY/Ib1FVf8k6Zn6dZLh/HH/RtJi0JwdzPI1IFW+lwVbKfwBvhQ1lw9cH2rs1UIVgi7Wxdgfy8gEWxf+QIqn62wG+Ulf/HkWGvTrRpoJqlYRNS/gnOWj9Z/4s99koAAACBAM/uJIo2I0nK15wXiTYs/NYUZA7wcErugFn70TRbSgduIFH6U/CQa3rgHJw9DCPCQJLq7pwCnFH7too/qaK+czDk04PsgqV0+Jc7957gU5miPg50d60eJMctHV4eQ1FpwmGGfXxRBR9k2ZvikWYatYir3L6/x1ir7M0bA9IzNU45") -- cgit v1.2.3 -- cgit v1.2.3 From a18abf5258a6447a161bae1a02877ece221d9f8b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 4 May 2019 11:42:08 -0400 Subject: propellor spin --- joeyconfig.hs | 8 +++++--- src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index 44215eba..547daee6 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -418,7 +418,8 @@ keysafe = host "keysafe.joeyh.name" $ props & Apt.serviceInstalledRunning "swapspace" & Cron.runPropellor (Cron.Times "30 * * * *") & Apt.installed ["etckeeper", "sudo"] - & Apt.removed ["nfs-common", "exim4", "exim4-base", "exim4-daemon-light", "rsyslog", "acpid", "rpcbind", "at"] + & JoeySites.noExim + & Apt.removed ["nfs-common", "rsyslog", "acpid", "rpcbind", "at"] & User.hasSomePassword (User "root") & User.accountFor (User "joey") @@ -526,13 +527,14 @@ standardSystemUnhardened suite arch motd = propertyList "standard system" $ prop & Apt.installed ["vim", "screen", "less"] & Cron.runPropellor (Cron.Times "30 * * * *") -- I use postfix, or no MTA. - & Apt.removed ["exim4", "exim4-daemon-light", "exim4-config", "exim4-base"] - `onChange` Apt.autoRemove + & JoeySites.noExim -- This is my standard container setup, Featuring automatic upgrades. standardContainer :: DebianSuite -> Property (HasInfo + Debian) standardContainer suite = propertyList "standard container" $ props & osDebian suite X86_64 + -- Do not want to run mail daemon inside a random container.. + & JoeySites.noExim & Apt.stdSourcesList `onChange` Apt.upgrade & Apt.unattendedUpgrades & Apt.cacheCleaned diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index f5812e7e..dcba975a 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1321,3 +1321,7 @@ rsyncNetBorgRepo d os = Borg.BorgRepoUsing os' ("2318@usw-s002.rsync.net:" ++ d) where -- rsync.net has a newer borg here os' = Borg.UsesEnvVar ("BORG_REMOTE_PATH", "borg1") : os + +noExim :: Property DebianLike +noExim = Apt.removed ["exim4", "exim4-base", "exim4-daemon-light"] + `onChange` Apt.autoRemove -- cgit v1.2.3 From 5c116b667221ecc90912d82a39db5c00412ab961 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 May 2019 13:35:45 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index dcba975a..faf242e0 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1025,7 +1025,7 @@ house user hosts ctx sshkey = propertyList "home automation" $ props ] -- Any changes to the rsync command will need my .authorized_keys -- rsync server command to be updated too. - rsynccommand = "rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/ joey@kitenet.net:/srv/web/house.joeyh.name/rrds/" + rsynccommand = "rsync -e 'ssh -i" ++ sshkeyfile ++ "' -avz rrds/ joey@kitenet.net:/srv/web/house.joeyh.name/rrds/ >/dev/null 2>&1" websitesymlink :: Property UnixLike websitesymlink = check (not . isSymbolicLink <$> getSymbolicLinkStatus "/var/www/html") -- cgit v1.2.3 -- cgit v1.2.3 From 38c27aa25409b02a1957d3dd7b489cd511cc0a92 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 3 Jun 2019 20:02:23 -0400 Subject: propellor spin --- joeyconfig.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/joeyconfig.hs b/joeyconfig.hs index 547daee6..337e239d 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -219,8 +219,7 @@ kite :: Host kite = host "kite.kitenet.net" $ props & standardSystemUnhardened Testing X86_64 [ "Welcome to kite!" ] & ipv4 "66.228.36.95" - -- routing problem with ipv6 currently - -- & ipv6 "2600:3c03::f03c:91ff:fe73:b0d2" + & ipv6 "2600:3c03::f03c:91ff:fe73:b0d2" & alias "kitenet.net" & Ssh.hostKeys (Context "kitenet.net") [ (SshDsa, "ssh-dss AAAAB3NzaC1kc3MAAACBAO9tnPUT4p+9z7K6/OYuiBNHaij4Nzv5YVBih1vMl+ALz0gYAj8RWJzXmqp5buFAyfgOoLw+H9s1bBS01Sy3i07Dm6cx1fWG4RXL/E/3w1tavX99GD2bBxDBu890ebA5Tp+eFRJkS9+JwSvFiF6CP7NbVjifCagoUO56Ig048RwDAAAAFQDPY2xM3q6KwsVQliel23nrd0rV2QAAAIEAga3hj1hL00rYPNnAUzT8GAaSP62S4W68lusErH+KPbsMwFBFY/Ib1FVf8k6Zn6dZLh/HH/RtJi0JwdzPI1IFW+lwVbKfwBvhQ1lw9cH2rs1UIVgi7Wxdgfy8gEWxf+QIqn62wG+Ulf/HkWGvTrRpoJqlYRNS/gnOWj9Z/4s99koAAACBAM/uJIo2I0nK15wXiTYs/NYUZA7wcErugFn70TRbSgduIFH6U/CQa3rgHJw9DCPCQJLq7pwCnFH7too/qaK+czDk04PsgqV0+Jc7957gU5miPg50d60eJMctHV4eQ1FpwmGGfXxRBR9k2ZvikWYatYir3L6/x1ir7M0bA9IzNU45") -- cgit v1.2.3