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

465 commits

Author SHA1 Message Date
Matthew Haughton
f18dcf0f1f fully qualify classes, defines and variables 2014-11-26 23:37:11 -05:00
Pierre Radermecker
c25c957a65 Use combined as a default for $format_log 2014-11-25 23:41:45 -05:00
Frank Groeneveld
ad4e74d5a2 Add initial OpenBSD support. 2014-11-25 20:08:05 +01: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
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
0d939d3e13 fixing up specs/config parameters 2014-11-22 12:40:01 -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
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
95f3cf13ab config.pp: add missing comma 2014-11-10 14:11:14 -05:00
James Fryman
487c8cae2c Changing deprecation notice 2014-11-08 17:38:06 +01:00
James Fryman
ef5f04d474 rename parameter logdir -> log_dir 2014-11-08 17:24:26 +01:00
James Fryman
a070813cc1 extracted all variables back to params.pp pattern 2014-11-08 17:22:30 +01:00
James Fryman
72a2461833 sync up data organization 2014-11-02 14:03:43 +01:00
James Fryman
6cf49ea0d4 sort parameters 2014-11-02 13:19:44 +01:00
James Fryman
035472208c seperate module/user parameters in config 2014-10-27 16:44:06 +01:00
Matthew Haughton
21f9e31692 Merge pull request #485 from jfryman/jfryman-patch-1 
Update default SSL Ciphers
 2014-10-26 02:00:09 -04:00
Matthew Haughton
6e76cab03b Revert 318750d5 
It didn't fix anything. The root cause of test failure is Puppet treating an integer
as a string in its ERB templates (except in the future parser).
 2014-10-23 14:09:56 -04:00
Matthew Haughton
318750d553 vhost: make port parameter defaults integers 
Fixes test failure for code introduced in abe4b495
 2014-10-23 13:13:40 -04:00
Derrick Dymock
8ce1f7f093 Fix tabs and hash rocket alignment. 2014-10-22 11:30:34 -07:00
James Fryman
dce2212d53 Update default SSL Ciphers 2014-10-20 11:48:55 -05:00
James Fryman
db15848deb Merge pull request #483 from ghoneycutt/strengthen_cipher_list 
Use stronger ciphers
 2014-10-20 11:47:39 -05:00
Garrett Honeycutt
db3c4a4955 Use stronger ciphers 
As suggested by Mozilla

https://wiki.mozilla.org/Security/Server_Side_TLS#Nginx
 2014-10-16 09:23:54 -04:00
Derrick Dymock
06ee2ca3ce Remove the SSLv3 by default in the vhost resource. 2014-10-15 10:52:31 -07:00
Daniel Dreier
22c6a7cb57 Allow internal-only location resources 
Location resources with internal == true are valid, but the module does
not allow them unless one or more of www_root, proxy, location_alias,
stub_status, fastcgi, or location_custom_cfg are set

This patch allows locations with none of those but internal == true to
be created.

This is a re-implementation of jfryman/nginx PR-388.
 2014-09-25 09:40:32 -07:00
James Fryman
b8e2ccc540 Merge pull request #453 from jfryman/add-puppet-module-tool 
Introducing Puppet Module Data
 2014-09-24 15:07:28 -07:00
Pierre Radermecker
0a46f25c3c Guard against undef 2014-09-24 02:06:15 +02:00
cdenneen
324179e7a4 Add include files to locations 2014-09-23 18:52:14 -04:00
Matthew Haughton
fad593a8f2 remove configtest_enable from nginx::config 
It will continue to be set in the main nginx class.
 2014-09-23 15:39:41 -04:00
James Fryman
abe5824566 remove nginx::config and nginx::service deprecation notice 2014-09-23 09:11:22 -05:00
Matthew Haughton
58d5c11cb8 Merge pull request #440 from ad-notam/master 
Re-add Gentoo support
 2014-09-21 12:07:01 -04:00
Luke Francis
230857f874 Fix to detect the major release version for redhat/centos 7 2014-09-20 22:38:29 -07:00
Matthew Haughton
00ec3f4e35 spec fixes 2014-09-21 01:27:35 -04:00
James Fryman
4c5f1e3b2a pass one of spec cleanup 2014-09-20 18:25:24 -05:00
James Fryman
9bd63d348d Introducing Puppet Module Tool 2014-09-20 13:29:40 -05:00
Frederik Wagner
ad391f67bf added nginx_vhosts_defaults parameter hash 2014-09-15 23:11:26 -04:00
Frederik Wagner
331338abdb added parameter ssl_session_timeout to vhost 2014-09-15 23:11:26 -04:00
Jan Rieger
183ee5d0c8 Re-add Gentoo support 2014-09-05 13:13:53 +02:00
Matthew Haughton
a002d8932e bug fixes surfaced by future parser 
* concat::fragment requires 'order' to be a string
* init parameters added in #373 referred to wrong variable name in params.pp
* cannot perform regex match on a number, so make {fastcgi,proxy}_cache_levels
  a string by default
* bug fixed in test suite
 2014-09-04 23:24:14 -04:00
Matthew Haughton
a931ef511d Merge pull request #382 from 3flex/294-fix-proxy_cache_levels-validation 
Correct validation of {proxy,fastcgi}_cache_levels
 2014-09-03 16:47:37 -04:00
Matthew Haughton
bbf6f4584d Merge pull request #413 from zshahan/enable_streaming 
Add flv and mp4 parameters to vhost::location
 2014-08-22 13:24:12 -04:00
James Fryman
a2dd6cdeae Merge pull request #377 from 3flex/modernize-travis 
Improve test suite (Travis updates, librarian-puppet removal, better utilize puppet-lint)
 2014-08-22 10:43:50 -05:00
Matthew Haughton
1779d7d68f Merge pull request #410 from jg-development/master 
Fixed documentation in resource map

Fixes #405
 2014-08-22 11:19:40 -04:00
Matthew Haughton
88d8984876 Fix remaining lint warnings 2014-08-18 23:04:24 -04:00
zshahan
68a46d3ed1 added streaming options. 2014-08-18 20:34:43 -05:00
Matthew Haughton
c692f1a9b6 Add Red Hat/CentOS 7 support 2014-08-18 14:12:27 -04:00
Jan Gantzert
2e678213ed Fixed documentation in resource map 2014-08-15 23:07:40 +02:00
Christoph Körner
9bedd7950a Renamed params to fastcgi_param and moved to fastcgi.erb 2014-08-13 12:24:59 +02:00
Christoph Körner
a128713520 Changed description of params in comment block 2014-08-11 10:19:41 +02:00
Christoph Körner
96138715d1 Add support of custom fastcgi_params 2014-08-11 10:04:21 +02:00
Zach Leslie
b00614162d Remove logdir selector when everything is the same 2014-07-28 14:49:10 -07:00
Zach Leslie
529fabb866 Update $root_group in manifests to use platform specifics 2014-07-28 14:49:10 -07:00
Zach Leslie
edf9b54fe2 Add specials for FreeBSD and $root_group 2014-07-28 14:49:10 -07:00
Zach Leslie
ce933e4abe Add FreeBSD case for $nx_daemon_user 2014-07-28 14:49:10 -07:00
Zach Leslie
305c439bc6 Fixup for matching $kernelversion on Joyent 
This replaces the code that used to exist and now accommodates FreeBSD
using the $kernel fact, but still allows Joyent selection from
$kernelversion.
 2014-07-28 14:48:56 -07:00
Matthew Haughton
7a0d717afe Correct validation of {proxy,fastcgi}_cache_levels 
Allow any combination of 1 and 2 in these formats: X, X:X,
and X:X:X, e.g.: "2", "2:2", "1:1:2". The old validation failed if
it wasn't an integer which didn't allow these formats.
 2014-07-19 21:00:24 -04:00
Zach Leslie
b939e92624 Update root group for wider support 
The super group on many platforms is known as root, which a UID of 0.
However, on other platforms, the UID is still 0, but the group is
'wheel'.  Largely historic UNIX jargon, but suffice to say that, to
support FreeBSD and others, setting the group of '0' has the same impact
while supporting a wider range of platforms.
 2014-07-12 13:19:38 -07:00
Zach Leslie
f2a36f7a2f Add support for FreeBSD package installation 2014-07-11 23:32:05 -07:00
Zach Leslie
622c3906e2 Initial Update to params for FreeBSD support 
This adds the necessary changes the params class and associated
variables to support FreeBSD.
 2014-07-11 23:32:05 -07:00
Alkivi
bfbded71d4 Added owner group and mode parameter. For all users, per sites-available directory and per sites conf 2014-07-03 16:06:54 +02:00
mr-tron
15eff7a8df Update init.pp 
Bad logic for type validate.
 2014-07-02 14:07:54 +04:00
Motiejus Jakštys
0a1dacf605 Allow using $http_cfg_append with list of lists 
It should be possible to include array of arrays in order to have
duplicate configuration keys (when permitted), like:

    nginx::http_cfg_append:
        - [include, /etc/nginx/vhosts/*.ngx]
        - [include, /etc/nginx/vhosts/*/*.ngx]
 2014-07-01 06:35:20 +02:00
Carl P. Corliss
7be12d0870 new raw_prepend / raw_append feature for vhosts & locations 
- added raw_prepend / raw_append to vhosts & locations, which
    adds raw lines to the vhost/location /without/ semicolons
  - added location_raw_prepend / location_raw_append to vhost
    for passing through to default location
  - added spec tests for new parameters
  - cleaned up location specs to match new header/body/footer setup
    reducing duplicate checks by testing header/footer separately.
  - cleaned up whitespace (2 space) in touched files
  - used `<%-` in erb templates to allow the use of leading
    whitespace, making the logic flow more readable
  - Also adds spec tests for recent vhost updates:
    - client_body_timeout
    - client_header_timeout
    - gzip_types
    - testing that the first server_name is used when www_to_non_www is true
 2014-06-26 00:00:37 -04:00
eholzbach
7a91ff4c2e allow setting gzip_types to vhosts 2014-06-25 13:58:55 -07:00
eholzbach
508e9e8d62 allows setting client_body/header_timeout on vhosts 2014-06-25 11:55:26 -07: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
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
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
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