Commit graph

6 commits

Author SHA1 Message Date
Nick Lewis
7f3f238f96 Merge remote-tracking branch 'cwarden/alternative-ports' 2012-10-18 18:58:59 -07:00
Nick Lewis
20d3e2fc33 Merge pull request #10 from grooverdan/ticket/11664-listen_port_fix
(#11664) Fix listen_port in template so it isn't ignored
2012-10-18 18:52:54 -07:00
Christian G. Warden
a214b0ff21 Support vhosts that listen on alternative ports
- Include the port in the listen directive
- Add an optional $server_name parameter to nginx::resource::vhost so
  server_name doesn't have to match the resource's name.  This allows
  the creation of multiple vhosts with the same server_name that listen
  on different ports.
2012-01-30 11:26:10 -08:00
Christian G. Warden
942c659fd0 Add per-location proxy read timeout parameter
Add a proxy_read_timeout parameter to set the read timeout setting
per-location.  The parameter can also be passed when declaring a vhost,
in which case it will apply to the root location.
2012-01-30 11:14:57 -08:00
Daniel Black
dede78ab3d (#11664) Fix listen_port in template so it isn't ignored
listen_port was being ignore when the template was generated.
This commit fixes it.
2012-01-03 12:20:27 +11:00
James Fryman
ebd481d570 Added SuSE Support 2011-06-06 17:25:04 -05:00