Here is what I've done:

The front set up is a Paul braze on mount, attached with a bolted through M5 bolt, to the front Surly rack braze on with a ToPeak BarXtender attached to that and a Cygolite DuoCross and battery attached to the BarXtender. I have it folded back in the attached picture. If I am using the top rack, it can be extended forward out of the way.

The rear set up is a cut down Planet Bike light mount attached with an M5 bolt.

Apologies for the quality of the pictures.