kernel nginx config fixes
Merge branch 'master' of https://github.com/systemdatarecorder/kernel