cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improvements

This commit is contained in:
Joey Hess 2014-03-30 00:52:02 -04:00
parent 08a0a46efe
commit e812acce3e
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HostProp.hs
View File

@ -25,7 +25,6 @@ getProperties "clam" =
, Apt.stdSourcesList Apt.Unstable `onChange` Apt.upgrade , Apt.stdSourcesList Apt.Unstable `onChange` Apt.upgrade
, Apt.installed ["etckeeper"] , Apt.installed ["etckeeper"]
, Apt.installed ["ssh"] , Apt.installed ["ssh"]
, Apt.installed ["git", "myrepos"]
, GitHome.installedFor "root" , GitHome.installedFor "root"
-- Harden the system, but only once root's authorized_keys -- Harden the system, but only once root's authorized_keys
-- is safely in place. -- is safely in place.
@ -38,7 +37,6 @@ getProperties "clam" =
, lineInFile "/etc/sudoers" "joey ALL=(ALL:ALL) ALL" , lineInFile "/etc/sudoers" "joey ALL=(ALL:ALL) ALL"
, GitHome.installedFor "joey" , GitHome.installedFor "joey"
-- Clam is a tor bridge. -- Clam is a tor bridge.
, Apt.installed ["tor"]
, Tor.isBridge , Tor.isBridge
-- Should come last as it reboots. -- Should come last as it reboots.
, Apt.installed ["systemd-sysv"] `onChange` Reboot.scheduled "+10" , Apt.installed ["systemd-sysv"] `onChange` Reboot.scheduled "+10"

3
Property.hs
View File

@ -147,6 +147,9 @@ property `onChange` hook = IOProperty (propertyDesc property) $ do
return $ combineResult r r' return $ combineResult r r'
_ -> return r _ -> return r
requires :: Property -> Property -> Property
x `requires` y = combineProperties (propertyDesc x) [y, x]
{- Makes a Property only be performed when a test succeeds. -} {- Makes a Property only be performed when a test succeeds. -}
check :: IO Bool -> Property -> Property check :: IO Bool -> Property -> Property
check c property = IOProperty (propertyDesc property) $ ifM c check c property = IOProperty (propertyDesc property) $ ifM c

2
Property/GitHome.hs
View File

@ -11,11 +11,13 @@ import Utility.SafeCommand
import Utility.Directory import Utility.Directory
import Utility.Monad import Utility.Monad
import Utility.Exception import Utility.Exception
import qualified Property.Apt as Apt
{- Clones Joey Hess's git home directory, and runs its fixups script. -} {- Clones Joey Hess's git home directory, and runs its fixups script. -}
installedFor :: UserName -> Property installedFor :: UserName -> Property
installedFor user = check (not <$> hasGitDir user) $ installedFor user = check (not <$> hasGitDir user) $
IOProperty ("githome " ++ user) (go =<< homedir user) IOProperty ("githome " ++ user) (go =<< homedir user)
`requires` Apt.installed ["git", "myrepos"]
where where
go Nothing = noChange go Nothing = noChange
go (Just home) = do go (Just home) = do

21
Property/Tor.hs
View File

@ -1,21 +1,18 @@
module Property.Tor where module Property.Tor where
import Control.Applicative
import Control.Monad
import System.FilePath
import Property import Property
import Property.User
import Utility.SafeCommand import Utility.SafeCommand
import Utility.Exception import qualified Property.Apt as Apt
isBridge :: Property isBridge :: Property
isBridge = fileHasContent "/etc/tor/torrc" isBridge = setup `requires` Apt.installed ["tor"]
[ "SocksPort 0" where
, "ORPort 443" setup = fileHasContent "/etc/tor/torrc"
, "BridgeRelay 1" [ "SocksPort 0"
, "Exitpolicy reject *:*" , "ORPort 443"
] `onChange` restartTor , "BridgeRelay 1"
, "Exitpolicy reject *:*"
] `onChange` restartTor
restartTor :: Property restartTor :: Property
restartTor = cmdProperty "service" [Param "tor", Param "restart"] restartTor = cmdProperty "service" [Param "tor", Param "restart"]