Commit graph

89 commits

Author SHA1 Message Date
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
Kevin Tham
a97e0385ba Use official nginx apt repo of stable releases for debian/ubuntu 2013-05-15 15:08:58 -07:00
Lee Green
d4c5db2f65 fix syntax error 2013-05-15 15:24:46 -04:00
James Fryman
169dd8b0d6 Merge pull request #53 from hingstarne/master
Added some minor enhancements
2013-05-15 10:22:46 -07:00
Bayard Randel
896d6658bb added params for types_hash_max_size and types_hash_bucket_size expected by nginx 1.2.x 2013-05-14 14:57:35 +12: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
Sander Hoentjen
4bcb0993c1 linting 2013-05-08 14:15:42 +02:00
Sander Hoentjen
57ee1ec1e7 make proxy_http_version configurable 2013-05-06 11:40:46 +02:00
Sander Hoentjen
8859c4e8db linting 2013-05-06 11:37:37 +02:00
James Fryman
2e8a148852 saner defaults 2013-04-25 16:22:09 -05:00
David Kitchen
9c93234c27 Added OCSP SSL stapling to reduce SSL handshake by 30% by sparing the revocation list if the certificate includes the intermediate layer to identify the trusted source 2013-04-25 10:48:04 +01:00
David Kitchen
9cb898f40d Added support for SPDY now that nginx 1.4 has arrived 2013-04-24 22:45:56 +01:00
David Kitchen
8108779538 Changed param defaults for Microcosm 2013-04-24 09:57:01 +01: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
Sander Hoentjen
e0843af76a Add support for upstream_cfg_prepend
Makes things possible like specifying ip_hash and/or keepalive.
2013-04-22 10:03:09 +02: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
8fcc6adbf9 removing wrong boolean quoting 2013-04-13 13:50:10 +02:00
do
265485dd31 ssl check fixed 2013-04-13 13:46:38 +02:00
Igor Ajdisek
5234649b8a Fixed typo in init.pp 2013-04-12 14:44:27 +03:00
Sander Hoentjen
4d05075f64 add support for mail module
See http://wiki.nginx.org/Modules#Mail_modules

Sample Usage:

 nginx::resource::mailhost { 'domain1.example':
   ensure      => present,
   auth_http   => 'server2.example/cgi-bin/auth',
   protocol    => 'smtp',
   listen_port => 587,
   ssl_port    => 465,
   starttls    => 'only',
   xclient     => 'off',
   ssl         => 'true',
   ssl_cert    => '/tmp/server.crt',
   ssl_key     => '/tmp/server.pem',
 }
2013-04-06 11:11:23 +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
a7c9057810 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-03-20 21:11:28 +04:00
Lebedev Vadim
74cfbe6c72 Add $nx_types_hash_max_size params
Fix puppet-lint ERROR
2013-03-16 13:34:07 +04:00
Ryan Fitzgerald
73f43293f7 fixing syntax error 2013-01-22 13:07:16 -05:00
Ryan Fitzgerald
884777290a adding in suport of amazon linux 2013-01-22 12:09:51 -05:00
James Fryman
7c4041d143 Merge pull request #35 from hunner/add_tryfiles
Add try_files option
2012-12-13 22:12:00 -08:00
Hunter Haugen
f171713662 Add scientific linux support
This commit simply adds scientific to the `$::operatingsystem`
selectors.
2012-12-10 15:58:58 -08: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
Tobias Brox
ddf026443e Added support for yet another redhat clone - scientific linux 2012-10-14 00:46:45 +02:00
James Fryman
4f6f488f6d Merge pull request #31 from guruHub/pull_listen_option
Added listen_options and ipv6_listen_options feature
2012-10-04 13:32:55 -07: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
James Fryman
91165742b6 fixing dangling commas at the end of class parameters 2012-10-04 15:17:31 -05: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
Guzmán Brasó
a9273d7fb8 Added support for stub_status location
If stub_status is provided as true a location will be created to provide
nginx status information from stub_status module.
2012-10-02 20:07:19 -03:00
Guzmán Brasó
197ad06bce Implementation of new vars configtest_enable and service_restart and their respective optional arguments.
Argument configtest_enable / params.pp $nx_configtest_enable
* Default false
* If true will set service[nginx] restart with contents of nx_service_restart.

Argument service_restart / params.pp $nx_service_restart
* Default '/etc/init.d/nginx configtest && /etc/init.d/nginx restart'
* Since nginx 0.7.53 nginx supports '-s HUP' which will reload testing configuration first, to be backwards compatible above default was choosen.

Many distributions of nginx already implement a configtest before restart, however many doesn't, and many
even don't provide restart but a stop/start combination. If configtest_enable is true then puppet will force
nginx to do a configtest no matter if it was going or not to do it itself.
2012-10-02 01:43:36 -03:00
Guzmán Brasó
e9d984eaaf Added purge support in confd.
Added confd_purge option to tell it to purge files non managed by pupet in conf.d, default is false.

Because vhost_autogen it's not actually managed by puppet but indirectly created by a puppet executed
command, it's added as ignore to avoid getting it removed.

Better formating for confd purge support

Better formating for confd purge support
2012-10-01 23:31:50 -03:00
Guzmán Brasó
e1363545ae Moved worker_connections, worker_process and proxy_set_header to the new structure, backwards compatible
Defaults are set inside params, nginx class will set default and send it from local var to nginx::config,
so even when there is no need for set default values on nginx::config, in case someone already using
this module it's for some reason calling directly nginx::config, to avoid breaking anything defaults are
set inside nginx::config too.
2012-10-01 22:02:44 -03:00
Guzmán Brasó
af166a9ac5 Summary: Fixed error from cat when trying nginx.d/* on nodes without vhosts defined
Description:
When running first time from scratch, if class was included without any setup at all
and with sane defaults, in debian squeeze generates an error when trying to collect
non existant vhosts, because cat complains that can not expand * because there are no
files.

Changed:
Added unless to check that at least there is a file in nginx.d by testing it can expand.
2012-10-01 20:04:40 -03:00