diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-19 15:51:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-19 15:51:01 -0400 |
| commit | 494f5d3bef9a8f401ad472ce55ee96e48f8012c3 (patch) | |
| tree | 6d104ef93b5a485b7b10a96dcd08e37b4915b001 | |
| parent | 861cb5a61da667cc4804a5810dae3da4da0b6ce7 (diff) | |
| parent | 82d563a6a0f052f1f3fc249c7ee1aa5dee444e37 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | Propellor/Property/Apt.hs | 14 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/Propellor/Property/Apt.hs b/Propellor/Property/Apt.hs index 9234cbbf..7329c7a8 100644 --- a/Propellor/Property/Apt.hs +++ b/Propellor/Property/Apt.hs @@ -192,7 +192,9 @@ autoRemove = runApt ["-y", "autoremove"] unattendedUpgrades :: RevertableProperty unattendedUpgrades = RevertableProperty enable disable where - enable = setup True `before` Service.running "cron" + enable = setup True + `before` Service.running "cron" + `before` configure disable = setup False setup enabled = (if enabled then installed else removed) ["unattended-upgrades"] @@ -203,6 +205,16 @@ unattendedUpgrades = RevertableProperty enable disable v | enabled = "true" | otherwise = "false" + + configure = withOS "unattended upgrades configured" $ \o -> + case o of + -- the package defaults to only upgrading stable + (Just (System (Debian suite) _)) + | not (isStable suite) -> ensureProperty $ + "/etc/apt/apt.conf.d/50unattended-upgrades" + `File.containsLine` + ("\t\"o=Debian,a="++showSuite suite++"\";") + _ -> noChange -- | Preseeds debconf values and reconfigures the package so it takes -- effect. @@ -24,3 +24,8 @@ the PrivData, and instead configured using the attr. Getting the ssh host key into the attr will allow automatically exporting it via DNS (SSHFP record) +* Should be possible to generate a metapackage of all packages that + properties direct apt to install. Then any other packages can be + auto-removed. This would just be a matter of storing the apt-installed + packages in an Attr. Although not removing essential and base packages + could be problimatic. diff --git a/debian/changelog b/debian/changelog index 8f1e5f55..e83ff0e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ propellor (0.5.0) UNRELEASED; urgency=medium * Removed root domain records from SOA. Instead, use RootDomain when calling Dns.primary. * Dns primary and secondary properties are now revertable. + * When unattendedUpgrades is enabled on an Unstable or Testing system, + configure it to allow the upgrades. -- Joey Hess <joeyh@debian.org> Sat, 19 Apr 2014 10:46:35 -0400 |