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

785 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Fryman
74ec40739d Merge pull request #339 from janorn/small_fix_337 
Change nx_conf_dir to config::conf_dir
 2014-06-16 11:32:45 -05: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
James Fryman
144b653c0f Merge pull request #338 from janorn/config_dir 
Add nginx config dir as a parameter
 2014-06-16 09:43:10 -05:00
Carl P. Corliss
198d326eb0 use nx_conf_dir for nginx configuration path 2014-06-13 10:05:30 -04:00
Jan Örnstedt
1bfd597c92 Add pre conditions to spec file. 2014-06-13 14:22:45 +02: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
James Fryman
026c2def87 Merge pull request #336 from multiplay/fixtests_again 
Revert "Added ngnix::resources::upstream::member"
 2014-06-12 09:45:38 -05:00
Lee Packham
8e5c2ce278 Use librarian-puppet < 1.1.0 
1.1.0 is broken - 1.0.3 works fine.
 2014-06-12 10:33:44 +01: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
3691e83685 Merge pull request #334 from multiplay/fixtests_only 
Fix all rspec tests so they run
 2014-06-11 12:46:33 -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
Lee Packham
8eb26b792b Fix all rspec tests so they run 
For some reason these have been broken forever. Travis was failing,
correctly. I have updated the tests to be correct to how the code
actually works.

I would also suggest that if this is merged, we stop merging PRs that
have failed test runs. Tests matter in a module like this.
 2014-06-10 22:10:00 +01: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
James Fryman
c287616543 Merge pull request #329 from saz/patch-2 
Fix validation of events_use parameter
 2014-06-04 22:57:06 +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
James Fryman
3c7b544b9b Merge pull request #327 from hundredacres/master 
Puppet-lint fixes
 2014-06-04 22:17:31 +02:00
Matthew Schmitt
f0f00c6ca8 Puppet-lint fixes 2014-06-04 13:06:37 -07:00
James Fryman
0030399d34 Merge pull request #325 from janorn/sort_parameters 
Sorted all parameters alphabetically in the main nginx class
 2014-06-04 19:49:36 +02: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
James Fryman
4bc07a43c8 Merge pull request #323 from saz/multi_accept 
add option for multi_accept and events_use
 2014-06-04 10:47:24 +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
James Fryman
e7890e1025 Merge pull request #321 from saz/patch-1 
Fix error message if ssl_cert/ssl_key is not set.
 2014-05-29 06:56:20 -07: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
6c890da8ec Merge pull request #320 from timmow/client-max-body-size-ssl-vhost 
Add client_max_body_size to ssl vhost
 2014-05-27 12:06:57 -05: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
Tim Mower
9d1e2e8806 Add client_max_body_size to ssl vhost 2014-05-27 11:38:32 +01: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
5056ecb899 Merge pull request #311 from alexskr/master 
add location_allow/deny directives for alias and stub_status templates
 2014-05-16 13:19:03 +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
James Fryman
5cb8ea8fa8 Merge pull request #316 from edvinasme/archlinux 
Add Archlinux support
 2014-05-16 13:14:49 +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