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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-05-18 14:18:33 -04:00
parent 79bc355adc dcf6b88f46
commit ed6457f7fb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config-joey.hs
View File

@ -94,8 +94,8 @@ hosts = -- (o) `
& Docker.configured & Docker.configured
& Docker.docked hosts "amd64-git-annex-builder" & Docker.docked hosts "amd64-git-annex-builder"
& Docker.docked hosts "i386-git-annex-builder" & Docker.docked hosts "i386-git-annex-builder"
! Docker.docked hosts "armel-git-annex-builder-companion" & Docker.docked hosts "armel-git-annex-builder-companion"
! Docker.docked hosts "armel-git-annex-builder" & Docker.docked hosts "armel-git-annex-builder"
& Docker.garbageCollected `period` Daily & Docker.garbageCollected `period` Daily
& Apt.buildDep ["git-annex"] `period` Daily & Apt.buildDep ["git-annex"] `period` Daily

2
src/Propellor/Property/Apt.hs
View File

@ -213,7 +213,7 @@ unattendedUpgrades = RevertableProperty enable disable
| not (isStable suite) -> ensureProperty $ | not (isStable suite) -> ensureProperty $
"/etc/apt/apt.conf.d/50unattended-upgrades" "/etc/apt/apt.conf.d/50unattended-upgrades"
`File.containsLine` `File.containsLine`
("Unattended-Upgrade::Origins-Pattern { \"o=Debian,a="++suite++"\"; };") ("Unattended-Upgrade::Origins-Pattern { \"o=Debian,a="++showSuite suite++"\"; };")
_ -> noChange _ -> noChange
-- | Preseeds debconf values and reconfigures the package so it takes -- | Preseeds debconf values and reconfigures the package so it takes