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

389 commits

Author SHA1 Message Date
Carl P. Corliss
33303102fc refactor locations to remove a bit of redundancy 2014-06-23 17:41:21 -04:00
eholzbach
1317810c92 allow override of proxy_redirect = off 2014-06-23 11:39:56 -07:00
Carl P. Corliss
9cf983504a Reintegrate jfryman/puppet-nginx#331 (upstream exports/collections) 
- resurrecting jfryman/puppet-nginx#331 from @rainopik
- update (concat/stdlib) dependency version requirements based on current usage
- fix upstream tests to work with rainopik's changes in what was jfryman/puppet-nginx#331
 2014-06-21 12:36:28 -04:00
Maksym Melnychok
5b28d0553d configuration revamp 
- make many more things configurable
- stop using ::params::* for things that are configurable
- add worker_rlimit_nofile option
- add tcp_nopush option
 2014-06-21 11:08:29 +02:00
James Fryman
74855ff1ee Merge pull request #342 from Mayflower/suse-packages 
Suse packages
 2014-06-20 09:41:58 -05:00
Markus Handschuh
372b44276e Fix sendfile config 
Conflicts:
	manifests/config.pp
	manifests/init.pp
 2014-06-20 16:13:00 +02:00
Robin Gloster
3387346d4b Make sendfile configurable 
Conflicts:
	manifests/init.pp
 2014-06-20 16:09:02 +02:00
Robin Gloster
52923a4d55 use default package_name config for suse 2014-06-20 15:56:58 +02:00
Robin Gloster
bc5b256fa1 temp fix for not compiled ssl and different package name 2014-06-20 15:56:54 +02:00
Robin Gloster
970f0067a8 Fix Suse packages 
No idea why someone chose to set all these packages for installation.
I can't find any matching nginx.spec on Suse build service plus we don't
want to set a specific nginx package version so just use 'nginx' as package.
 2014-06-20 15:53:09 +02:00
Jan Örnstedt
d33b4e135d Change nx_conf_dir to config::conf_dir to make it possible to configure via parameter. 2014-06-16 16:55:37 +02:00
James Fryman
03094eabe5 Merge pull request #337 from rabbitt/master 
add ability to define geo and map mappings
 2014-06-16 09:43:15 -05:00
Carl P. Corliss
198d326eb0 use nx_conf_dir for nginx configuration path 2014-06-13 10:05:30 -04:00
Jan Örnstedt
d8e6d603e7 Replace hardcoded paths referring to '/etc/nginx' with config variable instead. 2014-06-13 13:51:45 +02:00
Jan Örnstedt
7459e91744 Made config dir available as a parameter. 2014-06-13 13:51:45 +02:00
Carl P. Corliss
d3810eb61c add geo and map mappings 2014-06-12 14:12:24 -04:00
Lee Packham
2a5e81feb5 Revert "Added ngnix::resources::upstream::member" 
Upstream members can no longer be exported and collected.

The change in #331 was fundamentally broken. I have therefore reverted
it as it shouldn't of been merged.

Essentially you can't use ensure with this change - meaning you can no
longer REMOVE an nginx config from the system - which is part of the
tests and also sane module practice.

The idea was nice - but the implementation broke things. This reverts
back to a good state, without modifying any tests where tests pass again
with the recent commits.

This reverts commit ebf3e4e58e.
 2014-06-12 10:08:59 +01:00
James Fryman
9c7cf2d182 Merge pull request #328 from janorn/run_as_unprivileged 
Run as unprivileged user
 2014-06-11 12:55:12 -05:00
James Fryman
70e772ed40 Merge pull request #332 from kimor79/master 
Allow format_log in ssl vhosts as well
 2014-06-11 12:29:59 -05:00
James Fryman
6107c768f1 Merge pull request #331 from rainopik/master 
Upstream members can be exported and collected
 2014-06-11 12:12:23 -05:00
James Fryman
04b78c416d Merge pull request #330 from saz/master 
make ssl listen option configurable
 2014-06-11 11:31:07 -05:00
Kimo Rosenbaum
2500373416 Keep style consistent 2014-06-09 15:49:58 -07:00
Kimo Rosenbaum
5495bd2617 Allow format_log in ssl as well 2014-06-09 15:49:33 -07:00
Rain Öpik
aa12db0961 Fix typo in doc 2014-06-06 22:25:41 -04:00
Rain Öpik
ebf3e4e58e Added ngnix::resources::upstream::member. Upstream members can now be exported and collected. 2014-06-06 21:56:29 -04:00
Jan Örnstedt
526620183d Added daemon_user as a parameter. 2014-06-05 00:00:41 +02:00
Jan Örnstedt
cc01a84e39 Validate boolean config option. 2014-06-04 23:28:33 +02:00
Jan Örnstedt
f5a12bdb33 Add super_user option to be able to launch nginx as unprivileged user without complains. 2014-06-04 23:28:32 +02:00
James Fryman
47a5beab0f Merge pull request #326 from janorn/proxy_conf 
Make proxy variables configurable via hiera
 2014-06-04 23:12:18 +02:00
Steffen Zieger
e3aaac9bae Fix validation of events_use parameter 2014-06-04 22:39:06 +02:00
Jan Örnstedt
8613a52be9 Added 4 proxy parameters. 
client_body_buffer_size
proxy_connect_timeout
proxy_read_timeout
proxy_send_timeout

And reference these variabels in the template.
 2014-06-04 22:19:10 +02:00
Jan Örnstedt
ba72229437 Replaced params references with config. 2014-06-04 22:19:10 +02:00
Jan Örnstedt
872d5970a8 Add proxy_read_timeout 2014-06-04 22:19:09 +02:00
Matthew Schmitt
f0f00c6ca8 Puppet-lint fixes 2014-06-04 13:06:37 -07:00
Jan Örnstedt
1bc31631d4 Sorted all parameters alphabetically in the main nginx class and the nginx::config class. 2014-06-04 18:08:40 +02:00
James Fryman
99df70b3dd Merge pull request #319 from cloudevelops/master 
Enabled undef for service where we dont want puppet control service
 2014-06-04 11:44:05 +02:00
Steffen Zieger
7b80b1a3c6 make ssl listen option configurable 2014-06-02 00:23:07 +02:00
Steffen Zieger
ce2bd7f068 add option for multi_accept and events_use 2014-05-31 16:06:23 +02:00
Steffen Zieger
cb190e2c6d Fix error message if ssl_cert/ssl_key is not set. 2014-05-29 15:23:57 +02:00
James Fryman
5933b360e0 Merge pull request #301 from yath/parser-future-backslash 
fix location sanitizing with parser 'future'
 2014-05-27 12:05:44 -05:00
Zdenek Janda
48c0895423 Enabled undef for service where we dont want puppet control service 2014-05-25 12:03:53 +02:00
James Fryman
8b7588dccc Merge pull request #315 from gini/basic_auth_for_proxy_locations 
Allow basic_auth for proxy locations and ...
 2014-05-16 13:18:01 +02:00
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