Commit graph

531 commits

Author SHA1 Message Date
Lebedev Vadim
a4ddf886b2 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-14 19:57:45 +04:00
Lebedev Vadim
088f1414c9 revert change priority type 2014-01-14 19:57:13 +04:00
Slava Semushin
643e803298 manifests/conf.pp: fixed a typo in error message. 2014-01-14 14:46:26 +03:00
James Fryman
42c290d87b Merge pull request #235 from 3flex/location-rewrite-rules
added rewrite to location/proxy & vhost
2014-01-13 11:05:16 -08:00
Matthew Haughton
dc3817f9ae added rewrite to location/proxy & vhost
With credit to https://github.com/OmarzT
2014-01-13 13:20:02 -05:00
Lebedev Vadim
e94af129e4 Fixed long names virtual hosts, such as nginx::resource::vhost { 'name1.domainname.org name2.domainname.org': }
Add example nginx::vhost with HTTPS FastCGI and redirection of HTTP
Add location_custom_cfg_prepend & location_custom_cfg_append. Used for logical structures such as if.
Fix puppet-lint
2014-01-12 23:15:14 +04:00
James Fryman
74a8ed1e87 Merge pull request #231 from CpuID/master
(Revised Commit) Support for server_names_hash_bucket_size and server_names_hash_max_size
2014-01-10 09:27:27 -08:00
Nathan Sullivan
70256dcb2a improved version of support for server_names_hash_bucket_size and server_names_hash_max_size for https://github.com/jfryman/puppet-nginx/pull/178 - also a few puppet-lint fixes 2014-01-10 13:42:16 +10:00
James Fryman
fa6be86dc2 Merge pull request #230 from 3flex/README-updates
README updates
2014-01-09 13:39:18 -08:00
Matthew Haughton
dd7df92ea2 cleanup README
* Make a hypothetical puppet-lint run happy
* Remove redundant parameters from resource declarations (e.g. 'ensure')
* Unquote a boolean which would fail with the recently added validations
* Simplify Puppet w/ Passenger example by removing SSL cipher/cache settings
* Add syntax highlighting where it was missing
* Provide complete vhost example for "Nginx with precompiled Passenger"
2014-01-09 16:37:47 -05:00
Matthew Haughton
12ecdadc35 add SSL configuration instructions to README 2014-01-09 16:33:44 -05:00
James Fryman
cd06f3593e Merge pull request #226 from huandu/master
Fix a config error in the last sample in README
2014-01-08 08:40:51 -08:00
James Fryman
7086aea8c0 Merge pull request #228 from PierreR/patch-1
Fix multi-line comment indentation
2014-01-08 08:40:25 -08:00
James Fryman
e0dbf1173c Merge pull request #227 from 3flex/validations
Validations for all parameters in the public classes
2014-01-08 08:40:06 -08:00
Pi3r
d26d9a41a8 Fix multi-line comment indentation
`puppetresources` is complaining about the wrong indentation scheme.
2014-01-08 15:46:56 +01:00
Matthew Haughton
2a82028a7b warn on inclusion of nginx:📦:suse 2014-01-07 23:16:54 -05:00
Matthew Haughton
5309136fc8 warn on inclusion of nginx:📦:redhat 2014-01-07 23:16:54 -05:00
Matthew Haughton
d7800f44ee warn on inclusion of nginx:📦:debian 2014-01-07 23:16:54 -05:00
Matthew Haughton
e2eba1dbe9 warn on inclusion of nginx::service 2014-01-07 23:16:54 -05:00
Matthew Haughton
2f36def38a warn on inclusion of nginx::params 2014-01-07 23:16:54 -05:00
Matthew Haughton
2fb7072e6e warn on inclusion of nginx::package 2014-01-07 23:16:54 -05:00
Matthew Haughton
ac8c74d78b warn on inclusion of nginx::config 2014-01-07 23:16:54 -05:00
Matthew Haughton
545056cb1a validations for nginx::resource::upstream 2014-01-07 23:16:54 -05:00
Matthew Haughton
10a1691b9e validations for nginx::resource::mailhost 2014-01-07 23:16:54 -05:00
Matthew Haughton
d683fae9ff validations for nginx::resource::vhost 2014-01-07 23:16:52 -05:00
Matthew Haughton
8e71d33121 validations for nginx::resource::location 2014-01-07 23:04:49 -05:00
Matthew Haughton
5a9767dcd8 validations for nginx::init 2014-01-07 22:17:03 -05:00
Matthew Haughton
5756568f21 variables should not be substituted in message
Using $priority meant it would be substituted with the value of the
parameter when it should be shown as static text.
2014-01-07 22:12:31 -05:00
Huan Du
a7436dbbba fix puppet master sample config error. 2014-01-07 18:47:25 +08:00
James Fryman
d1e1e509fd Merge pull request #223 from 3flex/validate-location-priority
Add validation for location $priority
2014-01-06 07:20:29 -08:00
James Fryman
ecdcabebf8 Merge pull request #225 from chrisdambrosio/patch-1
Fix index_files ivar warning
2014-01-06 07:19:58 -08:00
Chris D'Ambrosio
78e025b250 Fix index_files ivar warning
Fix the index_files instance variable deprecation warning.
2014-01-05 22:44:54 -08:00
Matthew Haughton
d22402c404 Add validation for $priority
Valid range changed to 401-599:

vhost SSL header has priority 700. If $priority is set to 400 (which
resolves to 400+300=700 for SSL locations), then it would conflict with
the priority of the header. It must be 401 or higher to avoid this.

Top end of range is limited to 599 to reflect documentation however it
could be increased to 698 and still provide expected behavior.
2014-01-03 13:03:55 -05:00
James Fryman
7d5cb888af version 0.0.7 2014-01-02 17:31:49 -06:00
James Fryman
1fa2687666 [blacksmith] Bump version 2014-01-02 17:31:14 -06:00
James Fryman
1024fb8a7c v0.0.7 release 2014-01-02 17:30:32 -06:00
Omar Tamer
1566daa60f added rewrite to location/proxy & vhost 2014-01-02 18:13:59 +00:00
James Fryman
64c055ce38 revert #218 /cc https://github.com/jfryman/puppet-nginx/pull/218#issuecomment-31458745 2014-01-02 09:49:58 -06:00
James Fryman
b921b80a75 Merge pull request #218 from andreyev/master
Separating the options with a space to avoid invalid one like "ssldefault"
2014-01-02 06:49:16 -08:00
Andreyev Dias de Melo
44cf3d4b2b Separating the options to avoid invalid one like "ssldefault" 2014-01-02 11:10:52 -02:00
James Fryman
71b81bf7fd Merge pull request #215 from 3flex/fix-broken-test
Update tests broken by merging #203
2013-12-30 10:18:37 -08:00
James Fryman
797c06d993 Merge pull request #216 from 3flex/patch-1
Fix "invalid byte sequence in UTF-8" errors introduced in #213
2013-12-30 10:13:59 -08:00
Matthew Haughton
0b93c0cebe Fix "invalid byte sequence in UTF-8" errors 2013-12-30 13:03:55 -05:00
Matthew Haughton
d973000dfd Update tests broken by merging #203 2013-12-30 12:44:19 -05:00
James Fryman
2b192933db Merge pull request #212 from hdanes/ssl_dhparam
Add support for Diffie-Hellman (SSL) parameters in VHOST resource.
2013-12-30 09:39:41 -08:00
Harry Danes
1d90dacfb3 Merge commit '96475098ebd4fba7dd951efcee1c6ee38b2935a9' into ssl_dhparam
Conflicts:
	manifests/resource/vhost.pp
2013-12-30 18:33:53 +01:00
James Fryman
96475098eb Merge pull request #214 from hdanes/master
Fix warning: Variable access via 'index_files' is deprecated.
2013-12-30 09:14:35 -08:00
James Fryman
bf5b06792b Merge pull request #213 from hdanes/ssl_stapling
Added support for SSL stapling of OCSP responses.
2013-12-30 09:14:08 -08:00
Harry Danes
334ebde9b6 Fix warning: Variable access via 'index_files' is deprecated. Use '@index_files' instead. 2013-12-29 16:13:17 +01:00
Harry Danes
d0c3168592 Implementation of the resolver parameter. 2013-12-29 15:48:32 +01:00