Tomas Barton
2cc0a2fcf0
support ssl_cache and for passenger cgi params
2013-09-29 20:36:19 +02:00
Lebedev Vadim
20a37a220f
Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
...
Conflicts:
manifests/config.pp
manifests/resource/location.pp
2013-09-08 16:50:16 +04:00
James Fryman
30d62246b2
Merge pull request #119 from alphagov/fix-permissions
...
Fix SSL cert and key permissions
2013-09-06 08:47:41 -07:00
James Fryman
59106eae7c
Merge pull request #128 from leoc/fix-www-rewrite-port
...
Use correct port for www rewrite
2013-09-06 08:44:49 -07:00
Lebedev Vadim
757bb87031
Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
...
Conflicts:
manifests/params.pp
manifests/resource/location.pp
manifests/resource/vhost.pp
templates/vhost/vhost_header.erb
2013-09-05 12:01:00 +04:00
Ashley Penney
39bc3f16ac
This commit addresses issue #49 , the lack of ways to set allow and
...
deny rules within a location.
2013-09-04 13:04:28 -04:00
Arthur Leonard Andersen
6934271b85
Use correct port for www rewrite
2013-09-03 23:42:16 +02:00
Tom Booth
af7ceb0eec
Give key's group permission to read
2013-08-22 22:13:53 +01:00
root
eb73601aac
Fix puppet-lint
2013-08-22 23:23:16 +04:00
root
f609f9601d
Adding option http_cfg_prepend to class nginx
2013-08-22 23:02:04 +04:00
root
7ae4d3446c
Merge branch 'user-defined-vhost-logs' of https://github.com/vrillusions/puppet-nginx into dev
2013-08-22 17:05:10 +04:00
Tom Booth
d149c43936
Fix SSL cert and key permissions
...
It is bad practice to use 644 on a private key so we
have migrated the key mode to 0400. The cert is already
avaliable publicly through nginx so we have allowed it
0444.
Nothing should need to write either the cert of the key
after puppet has run, so we have denied any writing.
2013-08-21 16:29:31 +01:00
Vikraman
b20b616bed
Fix the error 'You cannot specify more than one of content, source, target'
...
I get the above error message. It is easily fixed by removing the `ensure` inside `ensure_resource`, since `ensure_resource` should already be setting `$ensure` to `file`.
2013-08-11 12:15:26 +05:30
Todd Eddy
8cb8a31ade
Removed path checking to allow additional logging options.
2013-08-07 10:19:46 -04:00
Todd Eddy
c6cd476c82
Add custom logs to ssl vhosts as well.
2013-08-07 09:59:44 -04:00
Todd Eddy
94e87d86cd
Allow user modification of access and error log in vhost.
2013-08-06 21:11:58 -04:00
Pan
126fb413ea
Fix #106 when using wildcard certificate on multiple vhosts
2013-08-04 14:54:41 -07:00
Lebedev Vadim
49b5b79b76
* Option fastcgi_script fixed
...
* Options location_cfg_append and location_cfg_prepend added to fastcgi template
* Option www_root is optional now
* Options logging fixed in http template
* Auth_basic fixed in SSL vhost header
2013-08-01 01:07:59 +04:00
Marco Nenciarini
e104fc5a89
Inverted condition for IPv6 warning
...
If $ipv6_enable is true ypu sshould warn the user only if the machine _doesn't have_ an ip address.
At the moment the warning is raised when ipv6 is configured properly
2013-07-26 10:15:55 +02:00
Michael Chapman
04c54170c7
Add index_files to location for vhost
...
This patch passes the index_files parameter
down from the vhost resource to its
associated location, where previsouly
it was ignored.
2013-07-13 15:28:49 +10:00
Jon Morton
d401841279
Change custom_cfg to location_custom_cfg
2013-07-03 15:54:33 -05:00
Igor Ajdisek
e0e5757b55
Made SPDY a toggle param.
...
Added ssl_ciphers and ssl_protocols as params which default to values as proposed on nginx.org.
If SSL vhost then ssl is added to listen directive as proposed on nginx.org.
2013-06-27 15:42:38 +02:00
Maarten Dirkse
7714251f67
Removed various puppet-lint warnings and fixed a typo
2013-06-13 18:51:33 +02:00
do
e20b7d11c3
fixing boolean comparisons
2013-05-26 14:24:40 +02:00
Lebedev Vadim
d7cdd68c63
Merge branch 'master' of https://github.com/jfryman/puppet-nginx
2013-05-21 17:15:59 +04:00
Lebedev Vadim
8d33fd63f1
Merge branch 'master' of https://github.com/jfryman/puppet-nginx
...
Conflicts:
manifests/config.pp
manifests/init.pp
manifests/params.pp
manifests/resource/location.pp
manifests/resource/vhost.pp
manifests/service.pp
templates/vhost/vhost_footer.erb
templates/vhost/vhost_header.erb
templates/vhost/vhost_location_directory.erb
templates/vhost/vhost_location_proxy.erb
templates/vhost/vhost_ssl_header.erb
tests/vhost.pp
2013-05-21 16:30:21 +04:00
Lebedev Vadim
4f0c311901
* Fixed listen parameter in template vhost_ssl_header
...
* Added auth basic support
* Added vhost_cfg_append parameter to `nginx::resource::vhost`
2013-05-20 18:30:32 +04:00
Lee Green
d4c5db2f65
fix syntax error
2013-05-15 15:24:46 -04:00
Arne Hingst
921d7f7d57
ability to add include statements for static config files fro ghosts
2013-05-13 10:57:58 +02:00
Arne Hingst
3c0c836626
enforce ssl protocoll for a vhost
2013-05-13 10:51:47 +02:00
David Kitchen
7e33272f84
Changed SSL ciphers to the recent default for Nginx which is much
...
more secure
Added SSL caching to speed up SSL requests
Add server_tokens to the global config so this can be turned on|off
between dev and prod
Add proxy_set_header to vhost as different vhosts may require different
headers and the global setting is not ideal
Minor space formatting so that the generated files are fractionally
more readable
2013-04-24 09:42:06 +01:00
Lebedev Vadim
9672b7d345
* Get ssl key/cert with provided file-locations
...
* Parameter index has now become optional
* Fix typos
2013-04-16 20:12:32 +04:00
do
564e9c3f3d
more boolean comparison fixes
2013-04-13 19:39:52 +02:00
do
276efcad66
indentation
2013-04-13 13:52:21 +02:00
do
7f6acdf643
removing wrong boolean quoting
2013-04-13 13:50:40 +02:00
do
265485dd31
ssl check fixed
2013-04-13 13:46:38 +02:00
Lebedev Vadim
6defe17d0f
Add proxy_cache parameters
...
Fix puppet-lint
2013-03-27 22:13:52 +04:00
Lebedev Vadim
23c5bf7a9e
Merge branch 'master' of https://github.com/joejulian/puppetlabs-nginx
...
Conflicts:
manifests/resource/location.pp
manifests/resource/vhost.pp
2013-03-20 21:44:45 +04:00
Lebedev Vadim
74cfbe6c72
Add $nx_types_hash_max_size params
...
Fix puppet-lint ERROR
2013-03-16 13:34:07 +04:00
Joe Julian
39f848c4ad
Rebase bashtoni's pull request from a year ago:
...
https://github.com/puppetlabs/puppetlabs-nginx/pull/9
2012-12-05 23:11:29 -08:00
Hunter Haugen
e419006b74
Add try_files option
...
Nginx supports a option via http://wiki.nginx.org/HttpCoreModule#try_files and this adds this as a parameter
2012-11-08 14:15:28 -08:00
Hunter Haugen
b65114d327
Fixup incorrect changes from merge
2012-11-08 14:07:16 -08:00
Hunter Haugen
003f415beb
Merge remote-tracking branch 'jfryman/master' into merge_upstream
2012-11-08 10:09:49 -08:00
Nick Lewis
4aa2dd3d35
Merge remote-tracking branch 'grooverdan/ticket/11667-try_files_support'
2012-10-18 19:15:09 -07:00
Nick Lewis
7f3f238f96
Merge remote-tracking branch 'cwarden/alternative-ports'
2012-10-18 18:58:59 -07:00
juaningan
b4ddaf22df
Added SSL port support and if SSL and listen port are the same just creates SSL vhost and location
2012-10-18 15:33:07 +02:00
Guzmán Brasó
1e6f9dc93c
Added listen_options and ipv6_listen_options feature
...
* Allows to set exta option to listen directives like 'default'.
* This won't change on ipv6 listen template the option ipv6only=on.
2012-10-04 17:17:50 -03:00
Guzmán Brasó
49beb91993
James,
...
This is the best way I found to tackle the problem of custom directives, trying to
avoid common usage of module involve hacking the module/template to be able place
custom directives.
Right now support was added only for location context (default and custom ones),
it expects a hash with key value and it's supported on all current location types.
Added an example inside location.pp, usage it's pretty easy.
2012-10-02 23:35:56 -03:00
Lee Boynton
b7e7aa525d
Merge remote-tracking branch 'dhutty/master' into server-name-array
...
Conflicts:
manifests/resource/vhost.pp
templates/vhost/vhost_header.erb
2012-09-27 15:42:53 +01:00
Duncan Hutty
411419960b
add an array parameter to resource::vhost, server_name, that goes into the server_name nginx directive for that vhost
2012-09-10 17:15:32 -04:00