ddd714d65e
Add back log directory, needed for FreeBSD
...
Lost it in a merge conflict - totally my bad
2014-06-20 15:37:46 +01:00
04d807bcbb
Fix more group tests to not check for group
...
There's really no point checking for group as we no longer define it
2014-06-20 15:34:24 +01:00
ef908ecdd3
Merge remote-tracking branch 'upstream/master'
...
* upstream/master:
Create CONTRIBUTING.md
Change nx_conf_dir to config::conf_dir to make it possible to configure via parameter.
use nx_conf_dir for nginx configuration path
Add pre conditions to spec file.
Replace hardcoded paths referring to '/etc/nginx' with config variable instead.
Made config dir available as a parameter.
add geo and map mappings
Conflicts:
manifests/config.pp
2014-06-20 15:29:32 +01:00
d62b952a5c
No need to test for group as not defined
...
Group no longer needs defining - so no longer any point testing that it
is defined.
2014-06-20 15:27:44 +01:00
faf02cd128
Rather than specify group, let puppet
...
Puppet does 'the right thing' if you specify the group as None and then
rely on it to look up the group for that user.
2014-06-20 15:22:44 +01:00
e248a70766
Create CONTRIBUTING.md
2014-06-16 12:55:20 -05:00
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
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
03094eabe5
Merge pull request #337 from rabbitt/master
...
add ability to define geo and map mappings
2014-06-16 09:43:15 -05:00
144b653c0f
Merge pull request #338 from janorn/config_dir
...
Add nginx config dir as a parameter
2014-06-16 09:43:10 -05:00
8b6c1e9996
Fix groups on FreeBSD
2014-06-16 10:41:46 +01:00
198d326eb0
use nx_conf_dir for nginx configuration path
2014-06-13 10:05:30 -04:00
1bfd597c92
Add pre conditions to spec file.
2014-06-13 14:22:45 +02:00
d8e6d603e7
Replace hardcoded paths referring to '/etc/nginx' with config variable instead.
2014-06-13 13:51:45 +02:00
7459e91744
Made config dir available as a parameter.
2014-06-13 13:51:45 +02:00
5a3ae31d8b
Merge remote-tracking branch 'upstream/master'
...
* upstream/master:
Use librarian-puppet < 1.1.0
Revert "Added ngnix::resources::upstream::member"
Fix all rspec tests so they run
Keep style consistent
Allow format_log in ssl as well
Fix typo in doc
Added ngnix::resources::upstream::member. Upstream members can now be exported and collected.
Added daemon_user as a parameter.
Validate boolean config option.
Add super_user option to be able to launch nginx as unprivileged user without complains.
make ssl listen option configurable
Conflicts:
.travis/Gemfile
Gemfile
2014-06-13 08:44:40 +01:00
d3810eb61c
add geo and map mappings
2014-06-12 14:12:24 -04:00
026c2def87
Merge pull request #336 from multiplay/fixtests_again
...
Revert "Added ngnix::resources::upstream::member"
2014-06-12 09:45:38 -05:00
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
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
9c7cf2d182
Merge pull request #328 from janorn/run_as_unprivileged
...
Run as unprivileged user
2014-06-11 12:55:12 -05:00
3691e83685
Merge pull request #334 from multiplay/fixtests_only
...
Fix all rspec tests so they run
2014-06-11 12:46:33 -05:00
70e772ed40
Merge pull request #332 from kimor79/master
...
Allow format_log in ssl vhosts as well
2014-06-11 12:29:59 -05:00
6107c768f1
Merge pull request #331 from rainopik/master
...
Upstream members can be exported and collected
2014-06-11 12:12:23 -05:00
04b78c416d
Merge pull request #330 from saz/master
...
make ssl listen option configurable
2014-06-11 11:31:07 -05:00
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
98e5face25
Fix up the Travis GEM file and build status
2014-06-10 21:57:10 +01:00
c5ccbe0a30
Fix tests so they actually pass
...
Such a shame when people update code and not fix the tests - this does
that.
2014-06-10 21:50:51 +01:00
7679f62b41
Don't set nofiles on FreeBSD
...
On FreeBSD, this is handled dynamically by the kernel, so we don't
really want to set this here.
2014-06-10 12:31:11 +01:00
a233e2389a
FreeBSD support
2014-06-10 12:18:02 +01:00
2500373416
Keep style consistent
2014-06-09 15:49:58 -07:00
5495bd2617
Allow format_log in ssl as well
2014-06-09 15:49:33 -07:00
aa12db0961
Fix typo in doc
2014-06-06 22:25:41 -04:00
ebf3e4e58e
Added ngnix::resources::upstream::member. Upstream members can now be exported and collected.
2014-06-06 21:56:29 -04:00
526620183d
Added daemon_user as a parameter.
2014-06-05 00:00:41 +02:00
cc01a84e39
Validate boolean config option.
2014-06-04 23:28:33 +02:00
f5a12bdb33
Add super_user option to be able to launch nginx as unprivileged user without complains.
2014-06-04 23:28:32 +02:00
47a5beab0f
Merge pull request #326 from janorn/proxy_conf
...
Make proxy variables configurable via hiera
2014-06-04 23:12:18 +02:00
c287616543
Merge pull request #329 from saz/patch-2
...
Fix validation of events_use parameter
2014-06-04 22:57:06 +02:00
e3aaac9bae
Fix validation of events_use parameter
2014-06-04 22:39:06 +02:00
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
ba72229437
Replaced params references with config.
2014-06-04 22:19:10 +02:00
872d5970a8
Add proxy_read_timeout
2014-06-04 22:19:09 +02:00
3c7b544b9b
Merge pull request #327 from hundredacres/master
...
Puppet-lint fixes
2014-06-04 22:17:31 +02:00
f0f00c6ca8
Puppet-lint fixes
2014-06-04 13:06:37 -07:00
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
1bc31631d4
Sorted all parameters alphabetically in the main nginx class and the nginx::config class.
2014-06-04 18:08:40 +02:00
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
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
7b80b1a3c6
make ssl listen option configurable
2014-06-02 00:23:07 +02:00
Lee Packham
James Fryman
Jan Örnstedt
Carl P. Corliss
Lee Packham
Kimo Rosenbaum
Rain Öpik
Steffen Zieger
Matthew Schmitt