Use stock include folders for nginx and supervisord

Brent Tubbs avatarBrent Tubbs created an issue

Silk currently creates a 'conf' folder in the deployed site to house the nginx.conf and supervisord.conf includes.

For nginx that's already changing, as the zero-downtime fix means that we'll have multiple copies of the site in /srv at a time, and two or more of them running under supervisord, but nginx should point to only one. This implies that it would be better to put that one nginx include in /etc/nginx/conf.d/ or /etc/nginx/sites-enabled (probably the latter).

While we're doing that, it may also make sense to use /etc/supervisor/conf.d/ for the supervisord includes. The benefit to doing this is that we would no longer need special versions of the nginx or supervisord master config files (to include /srv/<site>/conf/). As long as you have nginx and supervisord installed with Ubuntu's default configuration, we'd be good to go. I think that's a win.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.