diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-01-01 17:20:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-01-01 17:20:56 -0400 |
| commit | 9f3ac90d08a1b6e926bb5052880fd588cefe9cbd (patch) | |
| tree | 75f5980ce920d159bb62a115f998b7d915d6c4fc /src | |
| parent | 3d0f8d78efe34a197d4354e14780e31eb3372d7e (diff) | |
| parent | 1cea3782f15f64ae6f55183e41eff47c80e27455 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index d8991cb1..408fadad 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -78,7 +78,8 @@ scrollBox = propertyList "scroll server" $ props `onChange` Ssh.restarted & User.shellSetTo (User "scroll") s & User.hasPassword (User "scroll") - & Apt.serviceInstalledRunning "telnetd" + -- telnetd attracted password crackers, so disabled + & Apt.removed ["telnetd"] & Apt.installed ["shellinabox"] & File.hasContent "/etc/default/shellinabox" [ "# Deployed by propellor" |