From f085b7de029c9a9b73a65e837cce72067bd858c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jul 2017 20:40:54 -0400 Subject: propellor spin --- joeyconfig.hs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index fa435abc..cb2c3bc0 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -231,8 +231,20 @@ honeybee = host "honeybee.kitenet.net" $ props , "nameserver 8.8.8.8" , "nameserver 8.8.4.4" ] - & JoeySites.ipmasq "eth0" "wlan0" - & Apt.installed ["ppp", "mtr", "iftop", "git-annex", "screen"] + & JoeySites.ipmasq "wlan0" + & Apt.installed ["ppp"] + `before` File.hasContent "/etc/ppp/peers/provider" + [ "user \"joeyh@arczip.com\"" + , "connect \"/usr/sbin/chat -v -f /etc/chatscripts/pap -T 9734111\"" + , "/dev/ttyACM0" + , "115200" + , "noipdefault" + , "defaultroute" + , "persist" + , "noauth" + ] + `before` File.hasPrivContent "/etc/ppp/pap-secrets" (Context "joeyh@arczip.com") + & Apt.installed ["mtr", "iftop", "git-annex", "screen"] & Postfix.satellite -- Autobuild runs only on weekdays. -- cgit v1.3-2-g0d8e From 08e5a3bed32738d7be71a51990554d97651b9ba6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jul 2017 21:02:39 -0400 Subject: propellor spin --- joeyconfig.hs | 2 +- src/Propellor/Property/SiteSpecific/JoeySites.hs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index cb2c3bc0..360a4075 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -244,7 +244,7 @@ honeybee = host "honeybee.kitenet.net" $ props , "noauth" ] `before` File.hasPrivContent "/etc/ppp/pap-secrets" (Context "joeyh@arczip.com") - & Apt.installed ["mtr", "iftop", "git-annex", "screen"] + & Apt.installed ["mtr", "iftop", "screen"] & Postfix.satellite -- Autobuild runs only on weekdays. diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index daf39805..3f3f657f 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -938,6 +938,7 @@ ipmasq intif = script `File.hasContent` , "if [ \"$IFACE\" = $INTIF ] || [ \"$IFACE\" = lo ]; then" , "exit 0" , "fi" + , "iptables -F" , "iptables -A FORWARD -i $IFACE -o $INTIF -m state --state ESTABLISHED,RELATED -j ACCEPT" , "iptables -A FORWARD -i $INTIF -o $IFACE -j ACCEPT" , "iptables -t nat -A POSTROUTING -o $IFACE -j MASQUERADE" -- cgit v1.3-2-g0d8e From 2ca09603bdfa6a071144be67644729e268070ce7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jul 2017 23:12:48 -0400 Subject: mtr-tiny to save space --- joeyconfig.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index 360a4075..747dc367 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -244,7 +244,7 @@ honeybee = host "honeybee.kitenet.net" $ props , "noauth" ] `before` File.hasPrivContent "/etc/ppp/pap-secrets" (Context "joeyh@arczip.com") - & Apt.installed ["mtr", "iftop", "screen"] + & Apt.installed ["mtr-tiny", "iftop", "screen"] & Postfix.satellite -- Autobuild runs only on weekdays. -- cgit v1.3-2-g0d8e