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

246 commits

Author SHA1 Message Date
Jason Clark
c7566d9134 Fix for order statements. Concat requires strings 2013-12-17 22:12:31 -06:00
Markus Rekkenbeil
b79259ed8b Add nginx autoindex to resource nginx::location and style up the 
nginx::vhost directory template

Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
 2013-12-16 17:36:24 +01:00
Markus Rekkenbeil
b7986f3dc3 Add nginx::vhost option 'autoindex' 
Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
 2013-12-12 17:27:29 +01:00
James Fryman
7c1674202a Merge pull request #170 from TelekomCloud/feature/set_proxy_method_and_body 
Add support for proxy method and body
 2013-12-05 07:48:18 -08:00
Matthew Haughton
a9c445b3f9 Remove unused code in vhost 2013-12-02 13:50:22 -05:00
Matthew Haughton
0e1d4adbd5 Remove unused code in mailhost 2013-12-02 13:49:47 -05:00
Matthew Haughton
d849c31c35 switch location resource to concat pattern 2013-11-30 21:24:55 -05:00
Matthew Haughton
753283286f switch vhost resource to concat pattern 
Also uses sites-available/enabled pattern for config files
 2013-11-30 21:24:50 -05:00
Matthew Haughton
2023ca1d6d switch mailhost resource to concat pattern 2013-11-30 21:21:40 -05:00
Dominik Richter
a83c513ac4 feature: add configurable proxy_set_body to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
Dominik Richter
a578dcea50 feature: add configurable proxy_method to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
Matthew Haughton
8292be0748 set required variables before template declared 
correctly sets www_root in the vhost_header template
 2013-11-21 23:23:45 -05:00
Matthew Haughton
4204dc908b Revert "Update vhost.pp" 
This reverts commit 5ee2f65.

Fixes #186
 2013-11-21 22:23:44 -05:00
Vadim Lebedev
5ee2f654fb Update vhost.pp 
bug fix. 
User priority for location 400-499, 501-599.
Header should have a priority lower than the others.
 2013-11-18 08:45:27 -08:00
TJ Biddle
3536069f16 Adding upstream fail_timeout. 2013-10-29 11:55:40 -07:00
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
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
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
531e523b0a Weird invalid characters in this comment. 2013-09-04 17:27:58 -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
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
Justice London
06f50454cb Small doc fix 2013-07-19 12:07:41 -04:00
Justice London
aeef0711bb Added split file support to location (for fastcgi) 2013-07-19 11:56:03 -04: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
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
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
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
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
Sander Hoentjen
4bcb0993c1 linting 2013-05-08 14:15:42 +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
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
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
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
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
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
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
drdla
9ca7e2b218 Add parameter to rewrite www to non-www 2012-09-01 18:46:27 +03:00
drdla
57e82fcaa3 removed remainder of merge conflict 2012-08-27 21:18:50 +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
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
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
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
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
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
James Fryman
7320a0ae56 Updated Documentation 2011-06-06 18:05:27 -05:00
James Fryman
ebd481d570 Added SuSE Support 2011-06-06 17:25:04 -05:00