summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-07add pointer to freebsdJoey Hess
2016-03-07Merge branch 'joeyconfig' into wipJoey Hess
2016-03-07Merge branch 'master' into wipJoey Hess
2016-03-07avoid non-exhaustive pattern matchJoey Hess
2016-03-07splitWs appears identical to wordsJoey Hess
2016-03-07typoeJoey Hess
2016-03-07propellor spinJoey Hess
2016-03-07propellor spinJoey Hess
2016-03-07clean up after mergeJoey Hess
2016-03-07Merge branch 'master' into joeyconfigJoey Hess
2016-03-07privdata/relocateJoey Hess
better than symlinks because this way no conflict can ever occur and, commit from hook
2016-03-07Return Left for FreeBSD on Debootstrap.Evan Cofsky
2016-03-07Fails on respin when it shouldn't recreate a Poudriere jail.Evan Cofsky
We were using checkResult instead of check, and we weren't parsing the output of `jail -l -q` properly. Now it handles respins perfectly.
2016-03-07add back after merging masterJoey Hess
2016-03-07Merge branch 'joeyconfig'Joey Hess
2016-03-07got tired of needing to cherry-pick changes into joeyconfig, wrote a hookJoey Hess
So, when I merge some branch into joeyconfig, config.hs will automatically be updated to point to joeyconfig.hs again, even if the merge changes it. And, when I merge joeyconfig into master, config.hs will be pointed back to config-simple.hs This may also be useful for others who maintain a branch like joeyconfig.
2016-03-07remove debian/rules guard in joeyconfig branchJoey Hess
Not needed any longer as I don't build the debs and thus can't accidentially build them from this branch.
2016-03-07changelogJoey Hess
2016-03-07minor style improvementsJoey Hess
2016-03-07minor style and layout improvementsJoey Hess
2016-03-07coding styleJoey Hess
2016-03-07minor style and layout improvementsJoey Hess
where blocks involve lest nesting than let in, and are more idiomatic in propellor properties
2016-03-07use catchIOJoey Hess
2016-03-07minor style improvementsJoey Hess
Made some code a little faster..
2016-03-07adjust haddock headersJoey Hess
for some reason I asked the author to put the copyright in there, but Propellor doesn't do per-file copyrights; it's all BSD. Also, make the maintainer show up in haddock.
2016-03-07avoid default fallthrough for SystemJoey Hess
This is so, when a user adds a new OS, ghc tells them everywhere they need to look to add it. Also, avoid throwing error from pure function..
2016-03-07make Cron.runPropellor pass System to bootstrapPropellorCommandJoey Hess
Rather than having the property fail when the Host has no OS defined, I made bootstrapPropellorCommand not install deps in this situation. The cron job will (probably) still work, unless a system upgrade causes deps to be removed.
2016-03-07clean upJoey Hess
2016-03-07refactorJoey Hess
2016-03-07indentsJoey Hess
2016-03-07unnecessary parensJoey Hess
2016-03-07fix checkBinaryCommandJoey Hess
The freebsd branch made it run ./propellor --check after verifying that command fails, which is clearly wrong.
2016-03-07fix indentJoey Hess
2016-03-07move fromString export to PropellorJoey Hess
My policy for config.hs is it shouldn't need to load any modules other than propellor and the desired property modules.
2016-03-07split config-freebsd back outJoey Hess
Let's keep config-simple quite simple; naive users start by modifying it and probably don't want to be faced with freebsd example, unless they're freebsd users.
2016-03-07add /propellor to gitignoreJoey Hess
It was removed in the freebsd branch, but I want to ignore the file. Limited to only the file at the top of the tree now.
2016-03-07change joeyconfig back after merging from masterJoey Hess
(cherry picked from commit 7743ef8542b6490c3c42ac826a26aa0b24991f22)
2016-03-07Merge remote-tracking branch 'remotes/misandrist/FreeBSD' into wipJoey Hess
2016-03-07updateJoey Hess
2016-03-07Firewall: add NatDestination to RulesFélix Sipma
(cherry picked from commit df40046fd65bc07eced41adb73c7e227d2b54cd1)
2016-03-07Ssh: change type of listenPort from Int to Port (API change)Félix Sipma
(cherry picked from commit 0207c5ab585f41877c1b9f9674a25941cffd2ac7)
2016-03-07add fromPort functionFélix Sipma
(cherry picked from commit c3a23f89092d1ef8367c37ab8993ea7031124f4b)
2016-03-07Added a commentmithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82
2016-03-07Added a commentmithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82
2016-03-07removedmithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82
2016-03-07Added a commentmithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82
2016-03-07FreeBSD Support including:Evan Cofsky
- Propellor bootstrapping - Basic pkg - Basic ZFS datasets and properties - Simple Poudriere configuration (regular and ZFS) - Poudriere jail creation FIXME: - Cron.hs: runPropellor needs the System, but hasn't yet gotten it. Reorganizing: - Remove FreeBSD.Process - Move ZFS up to Property - Add Info for Pkg.update/Pkg.upgrade - Move FreeBSD.md to doc so it'll show up automatically. - Merge the FreeBSD config with the other sample config. - Use Info to check Pkg updated/upgraded and Poudriere configured. - Warnings clean-up, move ZFS types to Propellor.Types. - Maintainer and license statements.
2016-03-07Merge branch 'joeyconfig'Joey Hess
2016-03-07changelogJoey Hess
2016-03-07improve filtering of interface filesJoey Hess