From 647e1a6de21176625e1844c6b3838ffca8dca70e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 30 Mar 2014 22:54:59 -0400 Subject: propellor spin --- Propellor.hs | 2 +- Property/Network.hs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Propellor.hs b/Propellor.hs index d8c1ddba..7a9e1451 100644 --- a/Propellor.hs +++ b/Propellor.hs @@ -25,7 +25,7 @@ getProperties hostname@"clam.kitenet.net" = , standardSystem Apt.Unstable -- Clam is a tor bridge, and an olduse.net shellbox. , Tor.isBridge - , ipv6to4 + , Network.ipv6to4 , JoeySites.oldUseNetshellBox -- I play with docker on clam. , Docker.configured diff --git a/Property/Network.hs b/Property/Network.hs index 7686c8b3..cd98100d 100644 --- a/Property/Network.hs +++ b/Property/Network.hs @@ -1,7 +1,7 @@ module Property.Network where import Common -import qualified Property.File as File +import Property.File interfaces :: FilePath interfaces = "/etc/network/interfaces" @@ -17,10 +17,11 @@ ipv6to4 = fileProperty "ipv6to4" go interfaces stanza = [ "# Automatically added by propeller" , "iface sit0 inet6 static" - , " address 2002:5044:5531::1" - , " netmask 64" - , " gateway ::192.88.99.1" + , "\taddress 2002:5044:5531::1" + , "\tnetmask 64" + , "\tgateway ::192.88.99.1" , "# End automatically added by propeller" + ] ifUp :: String -> Property ifUp iface = cmdProperty "ifup" [Param iface] -- cgit v1.2.3