Merge pull request #11081 from peter-stadler/nginx
authorRosen Penev <rosenp@gmail.com>
Mon, 3 Feb 2020 22:08:40 +0000 (14:08 -0800)
committerGitHub <noreply@github.com>
Mon, 3 Feb 2020 22:08:40 +0000 (14:08 -0800)
commit26f1fa80bc4133ebcf31fae7344de0db24b9c8c8
treee0241c6b6b6745d42c76abd6fe7ef572fdfbdd8f
parentf975168f5c7bdabdc7d62225f61a4f84fd73753a
parent2401fd6db5e582d1b1442e4832222a3fee50937a
Merge pull request #11081 from peter-stadler/nginx

nginx: use /etc/nginx/nginx.conf enabling conf.d/