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

717 commits

This branch
This branch
All branches
Author SHA1 Message Date
eholzbach
508e9e8d62 allows setting client_body/header_timeout on vhosts 2014-06-25 11:55:26 -07:00
James Fryman
a861f23778 Merge pull request #351 from rabbitt/feature/internal-locations 
add ability to designate location as internal
 2014-06-24 13:51:57 -05:00
Carl P. Corliss
9b14ba901e add ability to designate location as internal 2014-06-24 10:42:27 -04:00
James Fryman
400e58a505 Merge pull request #347 from rabbitt/feature/upstream-exports 
Reintegrate jfryman/puppet-nginx#331 (upstream exports/collections)
 2014-06-24 09:31:19 -05:00
James Fryman
560e269e04 Merge pull request #350 from eholzbach/master 
allow override of proxy_redirect = off
 2014-06-24 09:29:25 -05:00
James Fryman
fd912fa2c8 Merge pull request #353 from hundredacres/master 
Puppet-lint fix. Enclosing variable
 2014-06-24 09:27:37 -05:00
James Fryman
473ed04463 Merge pull request #354 from janorn/temp_paths 
Add client_body_temp_path and proxy_temp_path to proxy.conf.
 2014-06-24 09:27:18 -05:00
James Fryman
5c8fc63b08 Merge pull request #355 from janorn/rspec_test 
Add more spec tests
 2014-06-24 09:25:23 -05:00
James Fryman
53d17c5d8b Merge pull request #357 from nalbion/feature/ssl_implied_by_ssl_only 
$ssl implied by $ssl_only
 2014-06-24 09:24:05 -05:00
James Fryman
4f38050148 Merge pull request #352 from rabbitt/refactor-location 
refactor locations to remove a bit of redundancy
 2014-06-24 09:23:13 -05:00
Nick Albion
5c1cc4f828 $ssl is implied by $ssl_only 
(I'm too lazy to add ssl=true AND ssl_only=true to each location)
 2014-06-24 16:49:16 +10:00
Nick Albion
8a95137d94 $ssl is implied by $ssl_only 
(I'm too lazy to add ssl=true AND ssl_only=true to each location)
 2014-06-24 16:48:16 +10:00
Jan Örnstedt
65c90f1999 Added tests for 
pid
http_tcp_nodelay
http_tcp_nopush
keepalive_timeout
 2014-06-24 01:41:22 +02:00
Jan Örnstedt
ebd2a6a608 Add client_body_temp_path and proxy_temp_path to proxy.conf. 2014-06-24 00:33:56 +02:00
Matthew Schmitt
9092122ac1 Puppet-lint fix. Enclosing variable 2014-06-23 15:32:51 -07:00
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
James Fryman
b0a1df32c2 Merge pull request #349 from rabbitt/feature/return-instead-of-rewrite 
use 'return' over 'rewrite'
 2014-06-23 12:42:43 -05:00
James Fryman
09b42b9d54 Merge pull request #314 from janorn/pull_269 
Pull request 269 revisited
 2014-06-23 12:14:07 -05:00
Carl P. Corliss
9519298aba use return instead of rewrite for simple redirects (e.g., www -> naked domain) 2014-06-23 11:46:43 -04: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
James Fryman
fc30d4c620 Merge pull request #343 from Mayflower/sendfile 
Ability to turn off sendfile
 2014-06-20 09:40:37 -05:00
Robin Gloster
dc1b4b528c fix tests 2014-06-20 16:35:23 +02:00
Robin Gloster
817526cdc9 reset broken templates 2014-06-20 16:24:50 +02: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
James Fryman
e248a70766 Create CONTRIBUTING.md 2014-06-16 12:55:20 -05:00
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