Commit graph

892 commits

Author SHA1 Message Date
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
Zach Leslie
5dda0ad03c Align index to the rest of template contents 2014-07-28 14:12:42 -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
Matthew Haughton
32bc360d45 Convert specs to RSpec 2.99.1 syntax with Transpec
This conversion is done by Transpec 2.3.4 with the following command:
    transpec -c "rake spec" spec/classes/ spec/defines/ spec/spec_helper.rb

* 210 conversions
    from: it { should ... }
      to: it { is_expected.to ... }

* 19 conversions
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

* 15 conversions
    from: == expected
      to: eq(expected)

* 15 conversions
    from: obj.should
      to: expect(obj).to

For more details: https://github.com/yujinakayama/transpec#supported-conversions
2014-07-17 22:28:38 -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
James Fryman
61b569ca02 Merge pull request #373 from alkivi-sas/owner
Added owner group and mode parameter. For all users, per sites-available...
2014-07-07 09:56:42 -05: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
James Fryman
91e92e711c Merge pull request #371 from mr-tron/master
Changed testing variables in init.pp
2014-07-02 17:01:17 -05:00
mr-tron
15eff7a8df Update init.pp
Bad logic for type validate.
2014-07-02 14:07:54 +04:00
James Fryman
e270b763b6 Merge pull request #369 from Motiejus/validate_hash
Allow using $http_cfg_append with list of lists
2014-07-01 08:54:36 -05: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
James Fryman
e78ba1f265 Merge pull request #368 from janorn/travis
Change travis to exclude unwanted branches
2014-06-27 15:36:48 -05:00
Jan Örnstedt
46abf95d94 Change travis to exclude unwanted branches instead of only including master. 2014-06-27 22:30:20 +02:00
James Fryman
7490f39113 Merge pull request #365 from rabbitt/feature/raw_prepend_and_append
new raw_prepend / raw_append feature for vhosts & locations
2014-06-27 08:17:58 -05: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
James Fryman
8203f55894 Merge pull request #310 from kalmanolah/rewrite_non_www
Use first server name for non-www redirects to prevent issues with naming of vhosts within defined types.
2014-06-25 21:10:36 -05:00
James Fryman
207970635b Merge pull request #362 from eholzbach/master
allows setting client_body/header_timeout and gzip_types on vhosts
2014-06-25 21:03:20 -05: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
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
Kalman Olah
12d515f7f7 Use first server name for non-www redirects to prevent issues with naming of vhosts within defined types.
Signed-off-by: Kalman Olah <kalman@inuits.eu>
2014-06-24 19:22:43 +02: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