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

212 commits

Author SHA1 Message Date
Matthew Haughton
354a68ef63 validate all arrays 2013-10-20 17:58:25 -04:00
James Fryman
8845838390 regex replace / in resource::vhost Fixes #102 2013-10-19 15:55:52 -05:00
Michael G. Noll
291d5d2532 Fix RHEL installation support 2013-10-16 16:32:14 +02:00
Franz Pletz
3edc7ad4ac Fix dependency problems with APT repo handling 
The first issue was that Exec[apt_get_update_for_nginx] resource is only
needed if $manage_repo == true, so it was put inside the corresponding
if block.

But even inside the if-block, Exec[apt_get_update_for_nginx] could fail
when $package_source has an invalid value and no Apt::Source[nginx] is
defined, so the respective Apt::Source[nginx], if defined, will now notify
Exec[apt_get_update_for_nginx] and Exec[apt_get_update_for_nginx] will
no longer subscribe to Apt::Source[nginx].

It would probably make sense to add a call to fail() in the default case
of $package_source.
 2013-10-09 05:17:33 +02:00
Ronen Narkis
a54f7ad762 clearing miss placed line 2013-10-08 18:20:33 +03:00
Ronen Narkis
f54031f842 fixing broken merge 2013-10-08 15:42:12 +03:00
James Fryman
7ea6b570c3 Merge branch 'disable-yum-repo-management' of github.com:rytis/puppet-nginx into rytis-disable-yum-repo-management 
Conflicts:
	manifests/init.pp
	manifests/package.pp
	manifests/params.pp
 2013-10-07 14:46:42 -05:00
Tomas Barton
303efc634d fixed calling out of scope variables 2013-10-07 16:27:17 +02:00
Rytis Sileika
b6ee1e5973 Added param to package.pp to explicitly specify whether or not repository should be managed 2013-10-07 13:36:39 +00:00
Tomas Barton
6ab27d00b1 ensure_resource instead of !defined 2013-10-03 20:53:36 +02:00
Tomas Barton
82ce9223a9 possibility to disable default location 2013-09-29 20:53:25 +02:00
Tomas Barton
2cc0a2fcf0 support ssl_cache and for passenger cgi params 2013-09-29 20:36:19 +02:00
Tomas Barton
e3ce014354 support for nginx passenger debian repositories 2013-09-27 14:48:51 +02:00
Rytis Sileika
9db6a82ad1 Added class param to disable YUM repo management on RedHat platforms 2013-09-26 13:32:59 +00: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
James Fryman
741f5432b3 Merge pull request #134 from apenney/apt 
Switch to using puppetlabs-apt
 2013-09-06 08:43:56 -07:00
Omar Z
4da3e46207 added proxy_buffer_size with default value of 8k 2013-09-05 23:15:45 +01:00
Omar Z
53b4986b5d make proxy_buffers configurable 2013-09-05 22:57:50 +01:00
Omar Z
08c815d01e Merge remote-tracking branch 'upstream/master' 2013-09-05 22:27:59 +01: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
46a17f97c5 Refactor to use puppetlabs-apt. 
This is just the first step of fixing up the repo stuff and allowing
the module to take in a package_name, but this helps replace the
execs{} with puppetlabs-apt.

Tested on:  Debian 7, Ubuntu 12.04.
 2013-09-04 17:57:41 -04:00
Ashley Penney
531e523b0a Weird invalid characters in this comment. 2013-09-04 17:27:58 -04:00
James Fryman
2df378ef05 Merge pull request #131 from apenney/allow-deny 
location_allow and location_deny support.
 2013-09-04 13:05:58 -07:00
Ashley Penney
8ddc6f6ccf This commit allows you to set package_ensure in nginx and have that 
trickle through to the package classes.  I've avoided making them
into paramaterized classes and we just refer directly back to the main
nginx namespace to get the variable.  Makes for a cleaner looking
module!
 2013-09-04 13:29:30 -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
Omar Tamer
fda2969c20 make client_max_body_size configurable 2013-09-04 17:37:18 +01: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
Lebedev Vadim
15519e7eef Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/package/redhat.pp
	templates/vhost/vhost_footer.erb
	templates/vhost/vhost_header.erb
 2013-08-23 01:07:53 +04:00
Joshua Hoblitt
8a1981f640 update nginx::package to select the package class by $::osfamily 
There were some bugs in the existing $::operatingsystem based approach.

* amazon was it's own package set when it's properly part of $::osfamily ==
'redhat' as of facter >= 1.7.2

* gentoo was improperly part of the amazon package set; this patch removes
support for gentoo but it was broken anyways

modifications to nginx:📦:redhat were made as well

* it no longer tries to setup the nginx.org yumrepo for fedora as no packages
for fedora are currently provided

* amazon release numbers are inconsistent with EL.  Unknown
$::lsbmajdistrelease values are now mapped to 6 so it's no longer nessicary to
test for $::lsbmajdistrelease being undefined.  This logic will need to be
reworked after RHEL7.x is released.

* the url to the nginx repo was including $::operatingsystem in it but
nginx.org only has package dirs for 'rhel' & 'centos' which are presently
identical; the usage of the 'rhel' dir has been hardcoded.  This fixes broken
yum repo setup for all $::osfamily == 'redhat' platforms other than redhat and
centos.
 2013-08-22 13:32:54 -07: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
70207c9a65 Add logging customization to the main logs as well. 2013-08-07 21:27:13 -04:00
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
Justice London
6911b91f9e Merge branch 'master' of https://github.com/jfryman/puppet-nginx into jfryman-master 
Conflicts:
	templates/vhost/vhost_location_fastcgi.erb
 2013-08-02 13:07:53 -04: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
Justice London
30e9773aeb Merge pull request #1 from jfryman/master 
Merging upstream changes
 2013-07-25 09:51:45 -07:00
Lebedev Vadim
ae9303233c Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/init.pp
 2013-07-21 19:40:29 +04:00
James Fryman
a552e6b25a Merge pull request #90 from michaeltchapman/vhost_index 
Add index_files to location for vhost
 2013-07-21 04:33:04 -07:00
Lebedev Vadim
386026fda8 Adding option http_cfg_append to class nginx 
Fix puppet-lint
 2013-07-21 04:12:18 +04:00
Justice London
06f50454cb Small doc fix 2013-07-19 12:07:41 -04:00
Justice London
362dd85386 Added file definition to redhat package repo 2013-07-19 12:04:27 -04:00
Justice London
aeef0711bb Added split file support to location (for fastcgi) 2013-07-19 11:56:03 -04:00
Pan
1257cb3355 Add Hiera support 
This supports creating resourses directly in Hiera for better separation of data
 2013-07-18 15:10:12 -07:00
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