Commit graph

769 commits

Author SHA1 Message Date
Matthew Haughton
0adf7f7876 Merge pull request #378 from 3flex/rspec2.99-updates
Convert specs to RSpec 2.99.1 syntax with Transpec
2014-08-22 11:50:49 -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
82398b2fd2 Merge pull request #386 from xaque208/whitespace
Align index to the rest of template contents
2014-08-22 11:26:49 -04:00
Matthew Haughton
aea734606f Merge pull request #406 from corycomer/master
Fix deprecated variable access warning
2014-08-22 11:21:30 -04: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
James Fryman
6a242e036e of course I mess up markdown... 2014-08-22 10:04:42 -05:00
James Fryman
da2ed932bd Merge pull request #420 from jfryman/update-maintainers
Update maintainers in the Repository
2014-08-22 10:03:52 -05:00
James Fryman
e801c31d30 Update maintainers in the Repository
Promoting Matthew Haughton to Repo Collaborator
2014-08-22 10:02:42 -05:00
Matthew Haughton
5251d16914 Merge pull request #412 from 3flex/patch-4
Add Red Hat/CentOS 7 support
2014-08-22 10:58:05 -04:00
Matthew Haughton
88d8984876 Fix remaining lint warnings 2014-08-18 23:04:24 -04:00
Matthew Haughton
51ef4bd00e Fail on lint warnings from now on
Should improve PR quality and eliminate need for PRs to fix
any future lint issues
2014-08-18 22:44:07 -04:00
Matthew Haughton
e80cb6809c Disable noisy/unneeded puppet-lint checks
* disable '80 characters check' - this is pretty useless and noisy
* disable 'class inherits from params class' check - is for puppet 2.6 which isn't supported
2014-08-18 22:43:52 -04:00
Matthew Haughton
bdaba9a86a Add validate and lint tasks to travis script 2014-08-18 22:41:34 -04:00
Matthew Haughton
d7d63a847a Extend Travis test matrix
* Add ruby 2.1.0
* Add back ruby 1.8.7 as allowed failure - shows test results
  but won't mark build as failed
* Enable fast finish - quick feedback on failed builds
* Make test matrix explicit so it's easier to tell what's included
  in the matrix, instead of excluding certain combinations
2014-08-18 22:41:34 -04:00
Matthew Haughton
5aa2f66ca3 Correct errors introduced by using latest apt module
Since librarian-puppet had locked to old versions of Forge modules
but puppetlabs_spec_helper is now pulling the latest version,
there's this incompatibility to take care of in the test suite.
2014-08-18 22:41:34 -04:00
Matthew Haughton
2d4c9d98ac switch to puppetlabs_spec_helper
Removes librarian-puppet since puppetlabs_spec_helper
can now handle installing modules from the Forge.
2014-08-18 22:41:34 -04: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
Cory Comer
3874221ddb Fixing deprecated variable access warning 2014-08-15 04:37:43 -07:00
James Fryman
d0f1f85e8e Merge pull request #396 from chaosmail/master
Added configuration of custom fastcgi_params [fixes #389]
2014-08-13 09:35:12 -05:00
James Fryman
3427ab9160 bump to 0.0.10 2014-08-13 09:09:22 -05: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
1b7393de4f Removed params in README from example vhost 2014-08-11 10:15:38 +02:00
Christoph Körner
0f507f0d96 Added fastcgi in README for custom fastcgi_params 2014-08-11 10:12:09 +02:00
Christoph Körner
96138715d1 Add support of custom fastcgi_params 2014-08-11 10:04:21 +02:00
James Fryman
e79e91d945 Merge pull request #376 from xaque208/freebsd
Add FreeBSD Support
2014-07-28 16:55:49 -05:00
Zach Leslie
48e53ee10c Set spec group back to original 2014-07-28 14:49:10 -07: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
Zach Leslie
5dda0ad03c Align index to the rest of template contents 2014-07-28 14:12:42 -07: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