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

1215 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marin Vintila
a8cb664ef5 Fix uwsgi related tests 2015-05-08 18:00:35 +03:00
Matthew Haughton
acf53e571b Merge pull request #628 from 3flex/add-spec-test 
spec: add some more nginx.conf tests
 2015-05-08 08:47:47 -04:00
Matthew Haughton
8fc4044162 spec: add some more nginx.conf tests 2015-05-08 08:36:42 -04:00
Marin Vintila
66ee87b89e Fix diff lines leftover from merge 2015-05-08 12:22:31 +03:00
Marin Vintila
77aa952b20 Merge from master 2015-05-08 12:11:46 +03:00
Marin Vintila
5624e4ca55 Merge from master 2015-05-08 12:04:22 +03:00
Matthew Haughton
7c44738573 Merge pull request #627 from 3flex/quit-testing-on-ruby-1.8.7 
travis: drop ruby 1.8.7 tests
 2015-05-07 23:12:23 -04:00
Matthew Haughton
a3e84acd82 travis: drop ruby 1.8.7 tests 
The Ruby 1.8.7 tests have been broken for ages, and it's unlikely anyone
will do the work to restore support for the tests. Drop them from the suite
to save Travis CI from doing work for nothing on every commit.
 2015-05-07 22:47:16 -04:00
Matthew Haughton
f14da80814 Merge pull request #626 from 3flex/fail-on-lint-warnings 
Fail on lint warnings
 2015-05-07 22:45:55 -04:00
Matthew Haughton
6f84e08bda fix new lint issues 2015-05-07 22:36:39 -04:00
Matthew Haughton
472af945d6 rake: fix syntax of fail_on_warnings lint setting 2015-05-07 22:22:35 -04:00
Matthew Haughton
677ea5736c Merge pull request #548 from joehillen/fix542 
Include ssl settings in rewrite_www server.
 2015-05-07 15:51:22 -04:00
Joe Hillenbrand
2ff640d5dd Include ssl settings in rewrite_www server. 
fixes jfryman/puppet-nginx#542
 2015-05-07 12:35:09 -07:00
Matthew Haughton
8d1f4e42a3 Merge pull request #625 from Tombar/concat-fix 
remove ensure from concat::fragment as its deprecated
 2015-05-07 12:38:38 -04:00
Martin Loy
7912f0074b remove ensure from concat::fragment as its deprecated 2015-05-07 11:30:44 -03:00
Martin Loy
952805aaeb fix traling slash and aligment 2015-05-07 10:46:28 -03:00
Martin Loy
72bb663caf require vhost folder 2015-05-06 12:04:12 -03:00
Martin Loy
23fe0404c8 require conf.d folder 2015-05-06 12:03:26 -03:00
Matthew Haughton
3f95e281b9 Merge pull request #616 from Cofyc/cofyc_master 
fix docs
 2015-05-05 00:07:32 -04:00
Matthew Haughton
fd6b4cc088 Merge pull request #621 from 3flex/620-debian-8 
Add support for Debian 8
 2015-05-05 00:06:40 -04:00
Matthew Haughton
5ffb235e21 params: support debian 8 
Install from upstream by default like for other OSs
 2015-05-01 14:39:34 -04:00
Matthew Haughton
b8454400ac Merge pull request #613 from 3flex/test-on-puppet-4 
travis: test on Puppet 4 for real
 2015-05-01 12:00:27 -04:00
Matthew Haughton
d1ff642c44 Merge pull request #618 from mmarod/passenger_header 
Add passenger_set_header and passenger_env_var parameters for Passenger 5.0+
 2015-04-29 23:30:37 -04:00
Michael Marod
7e524d0785 change variable names as requested to match nginx params exactly... Also passenger_env_var is not set with passenger_set_env_var and this commit undoes that 2015-04-29 17:37:58 -04:00
Matthew Haughton
6bf4b7b7b1 Merge pull request #612 from 3flex/611-puppetlabs-apt-2-fixes 
package/debian: support puppetlabs-apt 2.0.0
 2015-04-29 15:04:24 -04:00
Michael Marod
d0464923d1 Add passenger_env_var parameter which deprecates passenger_cgi_param to support Passenger 5.0+ 2015-04-29 12:33:42 -04:00
Michael Marod
0aed6c1978 Add passenger_header parameter which deprecates passenger_cgi_param to support Passenger 5.0+ 2015-04-29 12:24:38 -04:00
Yecheng Fu
b65a5f08f7 fix docs 2015-04-28 12:44:44 +08:00
Matthew Haughton
941de4674e travis: test on Puppet 4 for real 
No need to test with future parser, the real thing is here.
 2015-04-23 09:45:19 -04:00
Matthew Haughton
8d36089dff location: mini-refactor for puppet 4 
Without this an undef will be passed to regsubst when vhost => undef,
which causes an error with Puppet 4 so the friendly message from the
module won't be shown.
 2015-04-23 09:45:19 -04:00
Matthew Haughton
ae8a60da13 metadata: require puppetlabs-apt 1.8.0 or higher 
Support for full fingerprints was only added in puppetlabs-apt 1.8.0

This module started using full fingerprints as of d9b1d8c
 2015-04-22 15:46:07 -04:00
Matthew Haughton
6062ecec5c package/debian: support puppetlabs-apt 2.0.0 
puppetlabs-apt 2.0.0 drops support in apt::source for key_source and required_packages.

* key_source will default to keyserver.ubuntu.com which carries both keys, so it
  doesn't need to be explicitly defined
* required_packages can be emulated with the package resource
 2015-04-21 22:08:53 -04:00
Matthew Haughton
031fb9d896 Merge pull request #607 from 3flex/beaker 
Switch acceptance tests to Beaker
 2015-04-21 13:43:57 -04:00
Matthew Haughton
cc2f6387f0 Merge pull request #608 from 3flex/572-remove-auth_basic_user_file-resource 
location: remove the auth_basic_user_file resource
 2015-04-21 13:42:20 -04:00
Matthew Haughton
c78ef6e4f7 fastcgi_params: adjust whitespace for consistency 2015-04-15 14:15:45 -04:00
Matthew Haughton
51291ebee6 Merge pull request #530 from scottsb/master 
Fixing default location to use specified index files.
 2015-04-15 12:51:19 -04:00
Matthew Haughton
d1b9221a51 location: remove the auth_basic_user_file resource 
All it's doing right now is copying a file, but the copy of the file is
never referenced by the template.
 2015-04-14 23:45:51 -04:00
Matthew Haughton
b65080c625 Merge pull request #605 from 3flex/600-make-auth-available-everywhere 
location: move auth_basic directives to header
 2015-04-14 11:05:46 -04:00
Matthew Haughton
143e840ed1 Merge pull request #606 from 3flex/602-fix-redundant-code 
vhost: simplify maintenance variable code
 2015-04-14 11:05:35 -04:00
Matthew Haughton
78218ac8c7 beaker: add some more basic tests 2015-04-14 00:01:51 -04:00
Matthew Haughton
69ccfae779 no need for suse tests, there's no nodeset for it 2015-04-13 23:28:51 -04:00
Matthew Haughton
fd069a3aec beaker: add more nodesets 
CentOS 5, 6 & 7
Debian 6 & 7
Ubuntu Server 12.04
 2015-04-13 23:28:51 -04:00
Matthew Haughton
9dd92e7081 Convert acceptance specs to RSpec 3.2.2 syntax 
This conversion is done by Transpec 3.1.0 with the following command:
    transpec spec/acceptance/

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

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

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

* 1 conversion
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2015-04-13 23:28:51 -04:00
Matthew Haughton
e5085f39e6 switch to beaker-rspec from rspec-system-puppet 2015-04-13 23:28:51 -04:00
Matthew Haughton
f18e83f4b0 vhost: simplify maintenance variable code 2015-04-13 23:02:48 -04:00
Matthew Haughton
3027d9f35a location: move auth_basic directives to header 
Allows setting these directives on any location:
* auth_basic
* auth_basic_user_file
 2015-04-13 22:58:57 -04:00
Matthew Haughton
c54359f5fe Merge pull request #604 from 3flex/550-fix-create_resources-on-old-puppet 
init: fix create_resources declarations for old puppet versions
 2015-04-13 16:27:06 -04:00
Matthew Haughton
dfaa572525 init: fix create_resources declarations for old puppet versions 
Fixes #550
 2015-04-13 15:41:25 -04:00
James Fryman
6975ad000c Merge pull request #598 from 3flex/metadata-update 
metadata: add Puppet version compatibility
 2015-04-10 12:57:54 -04:00
Matthew Haughton
6fc2f6f9ec metadata: add Puppet version compatibility 
Also:
* Remove "description" field (is deprecated)
* Declare support for Debian 7
* Remove the ".0" part of the version number for Debian & Red Hat
 2015-04-10 12:39:40 -04:00