diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-05-21 13:09:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-21 13:09:25 -0400 |
| commit | d930b1ca301e146570c3e1f497048f18e8472b3b (patch) | |
| tree | 8c45beef8024ffdce20151c7d4a5b3898fdff91a /doc | |
| parent | 02a25686e5159471afb942767d8896a42ada4a30 (diff) | |
| parent | ba4f7cb05fd473d233206e360fe8b2e62b27796d (diff) | |
Merge branch 'master' of ssh://propellor.branchable.com
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn b/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn new file mode 100644 index 00000000..3156fdb4 --- /dev/null +++ b/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn @@ -0,0 +1,18 @@ +Please consider merging branch `sbuild` of repository `https://git.spwhitton.name/propellor`. + +This branch adds the following features: + +- A new module `Propellor.Property.Sbuild` with properties for configuring sbuild schroots +- A new module `Propellor.Property.Schroot` with a property supporting those in `Propellor.Property.Sbuild` +- A new module `Propellor.Property.Ccache` with a property supporting those in `Propellor.Property.Sbuild` +- An export of `extractSuite` from `Propellor.Property.Debootstrap`, used in `Propellor.Property.Sbuild` +- Two new types of iptables matching rules in `Propellor.Property.Firewall`. + +The additions to `Propellor.Property.Firewall` were made to support `Sbuild.blockNetwork`, which is a hack from the Debian Wiki which doesn't seem to work with the latest version of sbuild. I left the additions to `Propellor.Property.Firewall` in my branch since they are probably independently useful. I left the `blockNetwork` property commented-out in `Sbuild.hs` in case I or someone else can make it work at a later date. + +I get the following strange warning from GHC thanks to my new export from `Propellor.Property.Debootstrap`. I can't figure out the problem and would be grateful for help. + + src/Propellor/Property/Debootstrap.hs:8:9: Warning: + `extractSuite' is exported by `extractSuite' and `extractSuite' + +--spwhitton |