This is a non-tested commit.

We are experiencing some problems with installing nginx so at this
time it is not possible to test this. I'm committing anyway to avoid
losing this work accidentially.