The settlement ends a more than two-year legal dispute between former Police Chief Tom Ryff and the city.