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

1160 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Fryman
ba4b67a02d Merge pull request #522 from 3flex/puppet-lint 
Update puppet-lint config
 2014-12-10 09:05:25 -08:00
Matthew Haughton
2c6c6b4f21 Rakefile: use Puppet Approved puppet-lint config 2014-12-10 09:02:59 -05:00
Matthew Haughton
f0753b6551 move puppet-lint config back to Rakefile 
You can't set 'ignore_paths' in .puppet-lint.rc and having config in two places
is confusing.
 2014-12-10 09:01:05 -05:00
Matthew Haughton
8df2e752c6 don't ignore lint errors 2014-12-10 08:56:40 -05:00
Matthew Haughton
3cec62042e package: package resource is titled "nginx" 2014-12-09 22:06:51 -05:00
Matthew Haughton
1a10a23c1b package: don't install upstream package on Amazon Linux 
Upstream doesn't provide a build of Nginx for Amazon Linux.
 2014-12-09 21:49:40 -05:00
Matthew Haughton
1898182c6d spec: cleanup 
* Removed some tests that no longer apply and/or are redundant
* Only set OS facts when testing OS-specific behaviors. This simplifies the
  facts that must be set in the specs and saves running the same tests
  several times when the results wouldn't differ by OS anyway.
 2014-12-09 19:47:05 -05:00
Matthew Haughton
50c1e57c4c metadata: bound dependencies 
New requirement for the Puppet Forge.

These ranges ensure dependencies will stay on backwards compatible versions for the foreseeable future.
 2014-12-08 21:51:35 -05:00
Matthew Haughton
f02885289e metadata: use SPDX identifier for license info 
New requirement for the Puppet Forge
 2014-12-08 21:45:46 -05:00
Matthew Haughton
4cb0fb0d6f Merge pull request #517 from radford/fix-location-ensure 
location: fix ensure
 2014-12-08 15:05:07 -05:00
Matthew Haughton
faa6131bab Merge pull request #516 from 3flex/pass-parameters-to-service-class 
init: pass parameters when declaring nginx::service
 2014-12-08 14:31:54 -05:00
Jim Radford
c9c8361990 location: fix ensure 2014-12-08 11:27:58 -08:00
Matthew Haughton
08c4a64b90 init: pass parameters when declaring nginx::service 2014-12-08 14:16:40 -05:00
Matthew Haughton
ea942297ac Merge pull request #467 from invliD/proxy-header-fix 
Impossible to set proxy_set_header for default location
 2014-12-05 14:24:05 -05:00
Sebastian Brückner
8f793211a5 Fix proxy_set_header for default location 2014-12-04 11:27:48 +01:00
Matthew Haughton
311e50461e Merge pull request #513 from 3flex/fix-future-parser-failures 
fix a future parser failure introduced by #510
 2014-12-03 23:48:48 -05:00
Matthew Haughton
f07058a5fb fix a future parser failure introduced by #510 2014-12-03 23:41:53 -05:00
Matthew Haughton
53c949a51d Merge pull request #491 
Resolves #391
 2014-12-03 23:30:23 -05:00
Matthew Haughton
9647d1278f add negative test for log_format 2014-12-03 23:26:19 -05:00
Joshua B. Bussdieker
2e221a7e0f Support specifying log formats 2014-12-03 23:26:10 -05:00
Matthew Haughton
b9743d3826 Merge pull request #510 from 3flex/fully-qualify-variables 
Fully qualify classes, defines and variables
 2014-11-26 23:38:26 -05:00
Matthew Haughton
f18dcf0f1f fully qualify classes, defines and variables 2014-11-26 23:37:11 -05:00
Matthew Haughton
8b304c51e3 Merge pull request #462 
better default for format_log

Closes #462
 2014-11-26 21:49:29 -05:00
Matthew Haughton
87015f9331 add/update tests for #462 2014-11-26 21:35:24 -05:00
Pierre Radermecker
c25c957a65 Use combined as a default for $format_log 2014-11-25 23:41:45 -05:00
James Fryman
03aa252e1c Merge pull request #507 from frenkel/master 
Add initial OpenBSD support.
 2014-11-25 13:26:23 -06:00
Frank Groeneveld
ad4e74d5a2 Add initial OpenBSD support. 2014-11-25 20:08:05 +01:00
James Fryman
515f4ed52e Merge pull request #509 from jfryman/convert-to-strings 
Adjust integers to strings.
 2014-11-24 11:32:19 -06:00
James Fryman
c87744aab9 Adjust integers to strings. 
As part of merging #501, default values for config.pp were integers. However,
many of the current logic expects to see strings for many values. This commit
fixes things up while the validation logic can be adjusted to take account
integer.
 2014-11-24 11:22:41 -06:00
Matthew Haughton
ced82375f1 Merge pull request #508 from PierreR/patch-2 
Remove deprecated comment
 2014-11-23 20:16:54 -05:00
Pi3r
4110c6b82b Deprecated comment. 
I believe the hiera backend `module_data` has been introduced in 0.1 and then dropped again in 0.2 (I don't know why exactly).

Is this correct ?

Anyhow, there is no `data` directory anymore. Please update the docs. I am not sure I can really trust any comment now ?
 2014-11-23 23:54:42 +01:00
James Fryman
c9b82e7f5a Merge pull request #501 from jfryman/rip-out-module-data 
Rip back out puppet-module-data
 2014-11-22 12:53:05 -06:00
James Fryman
0d939d3e13 fixing up specs/config parameters 2014-11-22 12:40:01 -06:00
James Fryman
12ece07bb4 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into rip-out-module-data 
Conflicts:
	docs/hiera.md
 2014-11-19 08:31:59 -06:00
James Fryman
cb5cb839c7 make sure to call the right variable for log_dir 2014-11-17 12:56:45 -06:00
James Fryman
45728b8f71 Merge branch 'rip-out-module-data' of https://github.com/jfryman/puppet-nginx into rip-out-module-data 2014-11-17 12:37:40 -06:00
James Fryman
785a5c9901 inherit params 2014-11-17 12:37:23 -06:00
Matthew Haughton
1f79a5d848 change logdir to log_dir when calling config from init 2014-11-17 12:20:51 -05:00
Matthew Haughton
26129e4881 Revert d08b1408 
Change was committed to wrong branch
 2014-11-17 12:20:11 -05:00
Matthew Haughton
d08b140832 change logdir to log_dir when calling config from init 2014-11-17 12:18:45 -05:00
Matthew Haughton
92f74a63f7 fixtures.yml: remove module_data fixture 2014-11-17 11:42:35 -05:00
James Fryman
9310f7e660 adjust default worker count 2014-11-17 09:28:51 -06:00
James Fryman
c8e2b0eeaf fix up mismatched params 2014-11-17 09:15:01 -06:00
James Fryman
486dcd76b2 Merge branch 'rip-out-module-data' of https://github.com/jfryman/puppet-nginx into rip-out-module-data 2014-11-17 09:11:29 -06:00
James Fryman
d57c787087 allow user to declare nginx::config per docs 2014-11-17 09:11:04 -06:00
Matthew Haughton
1eb0b126c4 Merge pull request #502 from cewood/vhost-whitespace 
Reorganise whitespace in the vhost header and location header/footer.
 2014-11-12 09:45:29 -05:00
James Fryman
3e8d0192b9 Merge pull request #504 from ripienaar/patch-1 
fix my name
 2014-11-12 07:35:47 -06:00
R.I.Pienaar
5e603abfc7 fix my name 2014-11-12 12:52:33 +01:00
Cameron Wood (@cewood)
123b14edca Reorganise whitespace in the vhost header and location header/footer. 
The current template inserts newlines after a location, which doesn't
seem logical; one can't assume there will always be more blocks that
follow. Therefore it is only logical to include the newline before a
new location block is inserted, which lends itself to the convention
of only prepending newlines to blocks, never appending them.
 2014-11-12 16:04:45 +11:00
Matthew Haughton
f3f2c60131 Delete hiera.yaml 2014-11-10 14:13:54 -05:00