Commit graph

347 commits

Author SHA1 Message Date
Edvinas Klovas
0373c8492f typo fixes & trailing whitespace cleanup 2014-05-15 23:58:44 +02:00
Edvinas Klovas
949a000e80 Add Archlinux support
This commit adds Archlinux support. This needs changes in nginx.conf.erb
template and manifests to support pid value set to `false` (this skips it from
nginx.conf). This is due to `-pid /run/nginx.pid` being hardcoded to Archlinux
template. If you specify pid additionally in `nginx.conf` then nginx fails to
start.
2014-05-15 23:55:24 +02:00
Daniel Kerwin
b793058afb Add proxy_headers_hash_bucket_size to nginx::config 2014-05-15 16:34:01 +02:00
Daniel Kerwin
d11c6be681 Allow basic_auth for proxy locations and introducing parameter proxy_headers_hash_bucket_size with default of 64 2014-05-15 16:18:27 +02:00
Sebastian Schmidt
c78ee8c551 fix location sanitizing with parser 'future'
With parser 'future', a '\\' counts as one backslash whereas with
parser 'current' it's two. Therefore with 'future' only one gets passed
to regsubst which in turn aborts with

 Error: regsubst(): Bad regular expression `\'

The 'future' behaviour is indeed the correct one but 'current' won't be
fixed either. Therefore, use "\\\\" which produces two backslashes with
both parser (ref: https://tickets.puppetlabs.com/browse/PUP-1814).
2014-05-05 17:07:41 +02:00
root
402febc599 Add fastcgi_cache_key and fastcgi_cache_use_stale parameters 2014-04-27 09:49:45 -04:00
root
659a8cd4d0 add additional fastcgi parameters 2014-04-26 11:14:55 -04:00
root
024cc33d62 add support for fastcgi_cache_path 2014-04-26 10:34:29 -04:00
Sebastian Schmidt
048001e859 nginx:📦:debian: only include ::apt when needed
Only include ::apt when $manage_repo is true, it's not needed otherwise.
2014-04-19 20:46:04 +02:00
Harry Danes
f5fac8b245 Introduced log_by_lua and log_by_lua_file params. 2014-04-18 11:57:31 +02:00
James Fryman
8218c59d70 Merge pull request #295 from abraham1901/dev
Fix cert sanitized and add some options
2014-04-15 09:50:51 -05:00
James Fryman
c6857086fa Merge pull request #298 from pennycoders/master
Fix cannot generate tempfile error
2014-04-14 11:40:40 -05:00
Alex
0e27ce101e Use md5 hash for the location temp files 2014-04-13 05:29:20 +03:00
Alex Pica
d4da8f8eff Use md5 for location concat filenames 2014-04-13 05:12:19 +03:00
Lebedev Vadim
19acfe0356 Add option proxy_connect_timeout
Bug fix
2014-04-12 23:17:45 +04:00
Jim Radford
60a9a823b4 Stop using $root from upper scopes 2014-04-11 15:12:54 -07:00
Lebedev Vadim
3721ce1194 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/package/debian.pp
2014-04-11 23:16:53 +04:00
James Fryman
e87864b7f9 Merge pull request #293 from dol/feature/add-hiera-resource-mailhost
Added nginx::resource::mailhost to be configured via hiera
2014-04-11 12:09:42 -05:00
Lebedev Vadim
2f20bcc2b0 Remove trailing whitespaces 2014-04-11 20:04:24 +04:00
Lebedev Vadim
f3bebdff28 Added options to vhost:
format_log
location_custom_cfg_prepend
location_custom_cfg_append
2014-04-11 19:55:16 +04:00
Lebedev Vadim
819e92dd36 Fixed cert name sanitized 2014-04-11 19:47:19 +04:00
James Fryman
20a7ea01b1 Merge pull request #289 from b4ldr/master
Add additional config to the locations resource and fix set_header in vhost resource
2014-04-09 12:13:11 -05:00
John Bond
1b7ac9ab43 Add additional config to the locations section of config
Following parameters where added to the location resourse.  These
already existsed in the vhost resource so the same logic and defaults
where used
  * proxy_set_header
  * proxy_connect_timeout
  * proxy_redirect
2014-04-09 17:48:32 +02:00
Dominic Luechinger
43a5e7d6ff Added nginx::resource::mailhost to be configured via hiera
There is a slight chance the SSL 'concat::fragment' of the mailhost and
virtualhost are get in the way, if the name is declared the same.
2014-04-08 00:36:36 +02:00
James Fryman
e95a3abd46 Merge pull request #282 from genehand/master
Make proxy_redirect configurable
2014-04-06 09:42:49 -05:00
James Fryman
259a363b6f Merge pull request #287 from justinhennessy/jh_fix_lint_issues
Fixed lint errors
2014-04-06 09:34:29 -05:00
James Fryman
b0efd27ae0 Merge pull request #290 from pderaaij/master
Add configuring multiple resolvers via an array instead of a string
2014-04-06 09:14:21 -05:00
James Fryman
e20a343a7a Merge pull request #285 from TracyWebTech/master
Removing default.conf and example_ssl.conf
2014-04-03 09:37:52 -05:00
Paul de Raaij
1fbfe531b7 Add configuring multiple resolvers via an array instead of a string 2014-04-03 11:59:47 +02:00
Justin Hennessy
885b85ee6c Fixed lint issue 2014-03-30 21:41:34 +10:00
Justin Hennessy
acc093db32 Fixed lint errors 2014-03-30 21:23:43 +10:00
Sergio Oliveira
940bf427ab Removing default.conf and example_ssl.conf 2014-03-28 09:37:49 -03:00
Nathan Sullivan
8160de83ac allow setting custom priority before and after default SSL priority 2014-03-28 17:20:15 +10:00
James Fryman
364e2865aa Update suse.pp 2014-03-27 16:54:05 -05:00
James Fryman
338d3d8b2f Update redhat.pp 2014-03-27 16:53:51 -05:00
James Fryman
94ad2f3267 Update debian.pp 2014-03-27 16:53:41 -05:00
James Fryman
28018f5d35 Update service.pp 2014-03-27 16:52:40 -05:00
James Fryman
6a425e4365 Update params.pp 2014-03-27 16:52:26 -05:00
James Fryman
04520c7692 Update package.pp 2014-03-27 16:52:12 -05:00
James Fryman
c3646689f6 Update config.pp 2014-03-27 16:50:54 -05:00
Gene Hand
ea6129bf98 Make proxy_redirect configurable 2014-03-27 14:12:18 -07:00
Joshua Moore
64047f42fb SmartOS support 2014-03-24 17:14:32 -04:00
Joshua Moore
6fe431f698 SmartOS support 2014-03-24 17:07:38 -04:00
Joshua Moore
8ee7964d2b Replaced ::operatingsystem with ::kernelversion 2014-03-20 18:00:56 -04:00
Joshua Moore
c23e0ce7af conditionals for nx_conf_dir and SmartOS nx_daemon_user 2014-03-20 11:42:18 -04:00
James Fryman
aa89b20f98 Merge pull request #272 from DracoBlue/custom-template
Make template for nginx.conf.erb configurable
2014-03-19 11:21:48 -05:00
Jean-François Roche
4618ab180e fix missing ensure on concat::fragment resources 2014-03-18 13:35:57 +01:00
James Fryman
15506a5f98 Merge pull request #275 from gini/worker_rlimit_nofile
New parameter worker_rlimit_nofile
2014-03-17 12:54:07 -05:00
James Fryman
e59468a71f Merge pull request #264 from welterde/feature-service_disable
add service_ensure support
2014-03-17 12:29:02 -05:00
Daniel Kerwin
d831a869fc Add setting worker_rlimit_nofile with default of 1024 2014-03-12 18:17:41 +01:00
DracoBlue
e11e932365 Added proxy_conf_template option 2014-03-10 21:44:46 +01:00
DracoBlue
33d3c30015 Added template parameter to nginx class 2014-03-10 21:25:08 +01:00
DracoBlue
7e6dcdc1ec Added config variable for custom nginx.conf template 2014-03-10 21:19:25 +01:00
Zdenek Janda
58818b3a44 Ensure that vhosts are purged with new parameter purge_vhost 2014-03-07 22:18:10 +01:00
Tassilo Schweyer
b2d586d758 remove duplicate ref to params in nginx::service 2014-03-04 17:46:45 +01:00
Tassilo Schweyer
7fc83f707d add service_ensure support 2014-03-04 16:59:32 +01:00
James Fryman
fb560784e8 Merge pull request #265 from huandu/master
Puppet removes dir only if "force => true"
2014-03-04 09:03:26 -06:00
Huan Du
eb11249734 puppet removes dir only if "force => true" 2014-03-04 17:03:17 +08:00
Siggi Wanke
559eba3d7b Bugfix: Add missing gzip parameter 2014-02-14 09:47:38 +01:00
Jan Örnstedt
7938f05d18 Whitespace fix. 2014-02-12 10:01:22 +01:00
Jan Örnstedt
9bb83dd426 Cut and paste error. Removed debian from solaris case. 2014-02-12 09:19:01 +01:00
Jan Örnstedt
75d1478b37 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2014-02-11 09:03:34 +01:00
Markus Rekkenbeil
8cc32d4076 Bugfix: Add missing parameter for location template 2014-02-10 18:45:34 +01:00
Markus Rekkenbeil
971e1a7692 Update vhost_location documentation and template 2014-02-10 18:14:18 +01:00
James Fryman
d2f7f1403d Merge pull request #254 from cdenneen/master
Added vhost ssl prepend and append
2014-02-10 09:45:09 -06:00
cdenneen
408b0c8b12 Update vhost.pp 2014-02-07 18:40:52 -05:00
Peter Rhoades
4b807acbef Checks $caller_module_name is defined
[See #240]
2014-02-06 22:21:19 +00:00
James Fryman
26a856e338 Merge pull request #248 from PierreR/patch-1
Avoid creating undef variable
2014-02-06 08:59:19 -06:00
Tristan Helmich
15a2695442 Move ipv6only=on option from template into puppet
See jfryman#30
2014-02-03 12:54:44 +01:00
Pi3r
27a6fd7532 Avoid creating undef variable 2014-02-01 19:33:49 +01:00
Jan Örnstedt
4a0a857a38 Added basic support for nginx on Solaris. 2014-01-30 16:41:44 +01:00
James Fryman
eeb0830b7f Merge pull request #246 from inflection/add_client_max_body_size
Adding client_max_body_size.
2014-01-28 13:08:28 -08:00
James Fryman
8b29715179 Merge pull request #171 from thomasbiddle/upstream_fail_timeout
Adding upstream fail_timeout.
2014-01-28 12:57:14 -08:00
TJ Biddle
52b124e505 Adding client_max_body_size. 2014-01-28 12:52:56 -08:00
Lebedev Vadim
2252d96fe8 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-21 15:22:19 +04:00
Lebedev Vadim
26cf99c8e4 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-17 20:08:56 +04:00
Maurits Landewers
e36aa73b6e Make gzip configurable 2014-01-17 10:29:56 +01:00
Lebedev Vadim
a4ddf886b2 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-14 19:57:45 +04:00
Lebedev Vadim
088f1414c9 revert change priority type 2014-01-14 19:57:13 +04:00
Slava Semushin
643e803298 manifests/conf.pp: fixed a typo in error message. 2014-01-14 14:46:26 +03:00
Matthew Haughton
dc3817f9ae added rewrite to location/proxy & vhost
With credit to https://github.com/OmarzT
2014-01-13 13:20:02 -05:00
Lebedev Vadim
e94af129e4 Fixed long names virtual hosts, such as nginx::resource::vhost { 'name1.domainname.org name2.domainname.org': }
Add example nginx::vhost with HTTPS FastCGI and redirection of HTTP
Add location_custom_cfg_prepend & location_custom_cfg_append. Used for logical structures such as if.
Fix puppet-lint
2014-01-12 23:15:14 +04:00
Nathan Sullivan
70256dcb2a improved version of support for server_names_hash_bucket_size and server_names_hash_max_size for https://github.com/jfryman/puppet-nginx/pull/178 - also a few puppet-lint fixes 2014-01-10 13:42:16 +10:00
James Fryman
7086aea8c0 Merge pull request #228 from PierreR/patch-1
Fix multi-line comment indentation
2014-01-08 08:40:25 -08:00
Pi3r
d26d9a41a8 Fix multi-line comment indentation
`puppetresources` is complaining about the wrong indentation scheme.
2014-01-08 15:46:56 +01:00
Matthew Haughton
2a82028a7b warn on inclusion of nginx:📦:suse 2014-01-07 23:16:54 -05:00
Matthew Haughton
5309136fc8 warn on inclusion of nginx:📦:redhat 2014-01-07 23:16:54 -05:00
Matthew Haughton
d7800f44ee warn on inclusion of nginx:📦:debian 2014-01-07 23:16:54 -05:00
Matthew Haughton
e2eba1dbe9 warn on inclusion of nginx::service 2014-01-07 23:16:54 -05:00
Matthew Haughton
2f36def38a warn on inclusion of nginx::params 2014-01-07 23:16:54 -05:00
Matthew Haughton
2fb7072e6e warn on inclusion of nginx::package 2014-01-07 23:16:54 -05:00
Matthew Haughton
ac8c74d78b warn on inclusion of nginx::config 2014-01-07 23:16:54 -05:00
Matthew Haughton
545056cb1a validations for nginx::resource::upstream 2014-01-07 23:16:54 -05:00
Matthew Haughton
10a1691b9e validations for nginx::resource::mailhost 2014-01-07 23:16:54 -05:00
Matthew Haughton
d683fae9ff validations for nginx::resource::vhost 2014-01-07 23:16:52 -05:00
Matthew Haughton
8e71d33121 validations for nginx::resource::location 2014-01-07 23:04:49 -05:00
Matthew Haughton
5a9767dcd8 validations for nginx::init 2014-01-07 22:17:03 -05:00
Matthew Haughton
5756568f21 variables should not be substituted in message
Using $priority meant it would be substituted with the value of the
parameter when it should be shown as static text.
2014-01-07 22:12:31 -05:00
Matthew Haughton
d22402c404 Add validation for $priority
Valid range changed to 401-599:

vhost SSL header has priority 700. If $priority is set to 400 (which
resolves to 400+300=700 for SSL locations), then it would conflict with
the priority of the header. It must be 401 or higher to avoid this.

Top end of range is limited to 599 to reflect documentation however it
could be increased to 698 and still provide expected behavior.
2014-01-03 13:03:55 -05:00
Omar Tamer
1566daa60f added rewrite to location/proxy & vhost 2014-01-02 18:13:59 +00:00