From d616ba7cbceff43992a72537d66542e4c08fe284 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 19 Jul 2019 10:03:37 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 8e3f1fbb..c132fa78 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1083,16 +1083,19 @@ homeRouter = propertyList "home router" $ props ] `onChange` Service.restarted "dnsmasq" & ipmasq homerouterWifiInterface - -- Used to bring down eth0 when satellite is off, which causes ppp - -- to start, but I am not using this currently. - & Apt.removed ["netplug"] & Network.static' "eth0" (IPv4 "192.168.1.100") (Just (Network.Gateway (IPv4 "192.168.1.1"))) -- When satellite is down, fall back to dialup [ ("pre-up", "poff -a || true") , ("post-down", "pon") + -- ethernet autonegotiation with satellite receiver + -- sometimes fails + , ("ethernet-autoneg", "off") + , ("link-speed", "100") + , ("link-duplex", "full") ] `requires` Network.cleanInterfacesFile + `requires` Apt.installed ["ethtool"] & Apt.installed ["ppp"] `before` File.hasContent "/etc/ppp/peers/provider" [ "user \"joeyh@arczip.com\"" -- cgit v1.2.3 From d5236993838fcfce9ee832831c906c0af59ffca0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 7 Sep 2019 13:26:18 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index c132fa78..2d5925a0 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1233,10 +1233,10 @@ homeNAS = propertyList "home NAS" $ props [ "# let users power control startech hub with uhubctl" , "ATTR{idVendor}==\"" ++ hubvendor ++ "\", ATTR{idProduct}==\"005a\", MODE=\"0666\"" ] - & autoMountDrive "archive-10" (USBHubPort hubvendor 1) (Just "archive-older") - & autoMountDrive "archive-11" (USBHubPort hubvendor 2) (Just "archive-old") - & autoMountDrive "archive-12" (USBHubPort hubvendor 3) (Just "archive") - & autoMountDrive "passport" (USBHubPort hubvendor 4) Nothing + & autoMountDrive "archive-10" (USBHubPort hubvendor 1) (Just "archive-oldest") + & autoMountDrive "archive-11" (USBHubPort hubvendor 2) (Just "archive-older") + & autoMountDrive "archive-12" (USBHubPort hubvendor 3) (Just "archive-old") + & autoMountDrive "archive-13" (USBHubPort hubvendor 4) (Just "archive") & Apt.installed ["git-annex", "borgbackup"] where hubvendor = "0409" -- cgit v1.2.3 From 42faf50d11a7f657a32525e5d53a8118cf81c2be Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Sep 2019 11:58:56 -0400 Subject: update --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 2d5925a0..25bd780b 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -327,6 +327,8 @@ gitAnnexDistributor = combineProperties "git-annex distributor, including rsync & endpoint "/srv/web/downloads.kitenet.net/git-annex/autobuild/windows" -- git-annex distribution signing key & Gpg.keyImported (Gpg.GpgKeyId "89C809CB") (User "joey") + -- used for building rpms + & Apt.installed ["rpm", "createrepo"] where endpoint d = combineProperties ("endpoint " ++ d) $ props & File.dirExists d -- cgit v1.2.3