Restore working state by refactoring Makefile and Nginx config#537

bullet-ant wants to merge 2 commits intochromium:ubuntu-upgradechromium/badssl.com:ubuntu-upgradefrom

bullet-ant:upgrade-ubuntubullet-ant/badssl.com:upgrade-ubuntuCopy head branch name to clipboard