merge from master

This commit is contained in:
Joey Hess 2014-08-19 17:31:09 -04:00
parent 4766442124
commit 215a8e7f0e
1 changed files with 1 additions and 1 deletions

View File

@ -29,7 +29,7 @@ hosts =
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& Apt.installed ["etckeeper"] & Apt.installed ["etckeeper"]
& Apt.installed ["ssh"] & Apt.installed ["ssh"]
& User.hasSomePassword "root" & User.hasSomePassword "root" (Context "mybox.example.com")
& Network.ipv6to4 & Network.ipv6to4
& File.dirExists "/var/www" & File.dirExists "/var/www"
& Docker.docked hosts "webserver" & Docker.docked hosts "webserver"