summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-07-26 21:02:39 -0400
committerJoey Hess2017-07-26 21:02:39 -0400
commit08e5a3bed32738d7be71a51990554d97651b9ba6 (patch)
treef2c4bd7dfe145167cb55b39abcb11eab380a4730
parentf085b7de029c9a9b73a65e837cce72067bd858c3 (diff)
propellor spin
-rw-r--r--joeyconfig.hs2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs1
2 files changed, 2 insertions, 1 deletions
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"