opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
335 commits 2 branches 0 tags 1.4 MiB
Commit graph

159 commits

Author SHA1 Message Date
Justice London
f19a3b0a91 Lowered priority 2013-07-17 18:08:41 -04:00
Justice London
bdcad9a2ea Added priority to rhel 2013-07-17 18:01:52 -04:00
Arthur Leonard Andersen
0191a2fe28 Fix deprecated variable names 2013-07-17 20:42:57 +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
Lebedev Vadim
a3a1d11400 * Add location priority option 2013-07-08 23:06:02 +04:00
Stas Alekseev
b279978a32 Added gpgcheck to redhat yum repo configuration. 2013-07-05 10:56:38 -04:00
Jon Morton
d401841279 Change custom_cfg to location_custom_cfg 2013-07-03 15:54:33 -05:00
Jon Morton
d83822810e Add support for locations with only custom directives 2013-07-03 01:47:49 -05:00
Jon Morton
063f6b5670 Move location params checks above template calls 2013-07-02 19:18:14 -05:00
Mikołaj Siedlarek
eed8a218bd actually using server_tokens in nginx class 2013-07-02 09:56:30 +02: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
James Fryman
92fb4ae701 Merge pull request #75 from thaumazein/add-server-names-hash-bucket-size-param 
Add server_names_hash_bucket_size param
 2013-06-20 09:57:21 -07:00
James Fryman
c01a7a8280 Removing GeoIP Package from RH 2013-06-20 11:54:26 -05:00
Stefan Dorosz
179b1a4b5d Add server_names_hash_bucket_size param 2013-06-20 10:48:52 -04:00
Mark Burazin
72189931d3 Gentoo package 2013-06-17 11:11:26 +02:00
Mark Burazin
a43301d950 Gentoo OS added 2013-06-17 11:03:00 +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
a5ebd57b3b Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 18:41:44 +04: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
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
James Fryman
af4006cf66 Merge pull request #17 from lboynton/nginx-alias 
Add alias support
 2012-10-01 12:36:16 -07: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
Lee Boynton
1d50d9ea05 Add alias support 2012-09-24 17:01:40 +01:00
Lee Boynton
193775263d Include stdlib rather than using class to fix conflicts with other modules using stdlib 2012-09-24 15:52:48 +01:00
James Fryman
a5b8acbd6e Merge pull request #11 from drdla/patch-1 
Add parameter to rewrite www to non-www
 2012-09-17 10:27:53 -07: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
Brett Porter
b9afd221a3 support platforms that don't supply lsbmajdistrelease fact 2012-09-03 11:31:40 -07:00
Brett Porter
f2a14b9961 support redhat as operating system in addition to rhel 2012-09-02 01:48:52 -07:00
drdla
9ca7e2b218 Add parameter to rewrite www to non-www 2012-09-01 18:46:27 +03:00
James Fryman
3b7e191c1e fixing escape sequences 2012-08-28 15:08:30 -05:00
James Fryman
721fb2f79f Merge branch 'master' of github.com:jfryman/puppet-nginx 
Conflicts:
	manifests/package/redhat.pp
 2012-08-28 14:36:40 -05:00
James Fryman
08021c837c adding correct variable interpolation for nginx 2012-08-28 14:35:25 -05:00
drdla
57e82fcaa3 removed remainder of merge conflict 2012-08-27 21:18:50 +03:00
drdla
6ddef7ff0e Fixed typo (missing , at end of line) 2012-08-27 21:14:44 +03:00
James Fryman
4d02012150 Merge branch 'master' of github.com:jfryman/puppet-nginx 
Conflicts:
	README.markdown
	manifests/resource/location.pp
 2012-08-27 09:29:46 -05:00
James Fryman
49cc046ac8 addding yumrepo for RHEL systems to ensure latest from NGINX 2012-08-27 09:26:48 -05:00
Raffael Schmid
fdbccd5688 Fix small typo in variable name 2012-06-27 16:39:49 +03:00
Duke Dorje
d6ac760618 Remove tab characters. 2012-03-04 09:19:44 -08: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
James Turnbull
6cbefd7144 Merge pull request #16 from cwarden/per-location-proxy-read-timeout 
Add per-location proxy read timeout parameter
 2012-01-30 11:19:04 -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
James Turnbull
d2f559055b Merge pull request #7 from cwarden/qualify-facter-variables 
Fully-qualify facter variables
 2012-01-30 11:12:58 -08:00
James Turnbull
84257dcb9b Merge pull request #8 from cwarden/vhost-doc-cleanup 
Fix up references to location that should be vhost
 2012-01-30 11:08:34 -08:00
Daniel Black
719028ce5e (#11667) add try_files support in vhost and location directives 
Try_files is how NGINX files the files to serve particularly in a
fallback mode. Using an array for try_files will interate through
these options in the generated configuration file.
 2012-01-22 12:49:41 +11:00
Jeff McCune
c1166fde1a Whitespace only cleanup of Class[nginx::service] 2012-01-03 11:41:19 -08:00
Jeff McCune
f608b8ffd8 Contain all classes within Class[nginx] 
This change uses the anchor relationship from the puppetlabs-stdlib
module to contain all of the module classes within the main "ntp" class.

Without this change, end users of the module may have difficulty
ordering things correctly since they will have to peek inside the module
and figure out it's internal workings to identify all classes that
require relationship edges.
 2012-01-03 11:39:34 -08:00
Christian G. Warden
9ba2e3a1d9 Fix up references to location that should be vhost 
It looks like the comments were copied from nginx::resource::location.
This updates the comments to refer to vhosts where appropriate.
 2011-12-13 14:49:18 -08:00
Christian G. Warden
77f209d383 Fully-qualify facter variables 
Fully-qualify facter variables, $::kernel and $::operatingsystem.
 2011-12-13 11:45:31 -08:00
James Fryman
b9aac9292e added anchor pattern 2011-06-21 12:03:47 -07:00
Cody Herriges
3a27502ba9 Style compliance 
This commit puts the majority of the code provided by this module into
  compliance with the published style guide. Also updated Modulefile to
  have more sane pre-release values.
 2011-06-15 14:43:01 -07:00