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

1083 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Haughton
a3644ca037 Merge pull request #643 from jfryman/revert-624-master 
Revert "Require base folder for resources"
 2015-06-12 22:19:49 -04:00
Matthew Haughton
adcdef6f08 metadata: stick to puppetlabs-concat 1.x 
The puppetlabs-concat 2.x series has been yanked. Since we don't know what
format the new module will take, we should not declare compatibility with it.

See https://groups.google.com/forum/#!topic/puppet-users/4_Sxrfl4uUY

Reverts 4fd696f
 2015-06-12 22:17:05 -04:00
Matthew Haughton
7733db5432 Revert "Require base folder for resources" 2015-06-12 22:05:09 -04:00
Matthew Haughton
e87bdfafda Merge pull request #635 from geoffgarside/create-log-files 
Create directory for log files
 2015-06-03 22:51:17 -04:00
Geoff Garside
27334c1bd4 Manage the nginx log directory. 
Ensure the nginx::config::log_dir exists so that the access.log and error.log can be created. Also any nginx::vhost also put their access/error logs in this directory as well. This is done so that on platforms where /var/log/nginx is not created by package installation it exists so that nginx can startup and create the log files.

When vhost purge is enabled the log directory will not be touched and the log files will remain.
 2015-06-03 20:43:52 +01:00
Matthew Haughton
517dba1cd9 Merge pull request #636 from jacobmw/vhost_cache 
Vhost and loation proxy_cache_key and proxy_cache_use_stale
 2015-06-02 10:30:15 -04:00
Jacob McCoy Wade
66524e22b4 Adding ability to add proxy_cache_use_stale and proxy_cache_key within a location resource 
Adding spec tests for proxy_cache_key and proxy_cache_use_stale
 2015-06-01 14:32:26 -07:00
Matthew Haughton
4fd696fa53 metadata: allow for puppetlabs-concat 2.0.0 2015-06-01 12:02:26 -04:00
Matthew Haughton
796bf63893 Merge pull request #624 from Tombar/master 
Require base folder for resources
 2015-05-26 12:05:09 -04:00
Matthew Haughton
f3d6fa5f53 Merge pull request #545 from sanoma-technology/default_location_fix 
Prevent missing resource errors if custom configuration is used without default location
 2015-05-20 13:05:05 -04:00
Steve Maddison
62c8a1e558 Simplify default vhost configuration by passing parameters directly to resource. 
Prevent missing resource errors if custom configuration is used without default location.
 2015-05-20 12:38:20 +02:00
Matthew Haughton
c092c5a92a Merge pull request #632 from jfryman/update-upstream-tests 
spec: update upstream_spec for puppetlabs-concat 2
 2015-05-19 12:24:01 -04:00
Matthew Haughton
c143078763 spec: update upstream_spec for puppetlabs-concat 2 2015-05-19 11:55:41 -04:00
Steve Maddison
58ef49662d Merge pull request #1 from jfryman/master 
Merge upstream changes
 2015-05-19 14:22:28 +02:00
Matthew Haughton
9d456955c2 Merge pull request #623 from 3flex/599-ssl-updates 
SSL updates
 2015-05-12 13:34:06 -04:00
Matthew Haughton
678a361106 vhost: add ssl_crl parameter 2015-05-09 00:51:49 -04:00
Matthew Haughton
be4decdb78 vhost: don't copy any SSL files 2015-05-09 00:40:57 -04:00
James Fryman
086510c520 Merge pull request #398 from syscollective/master 
Add uwsgi support
 2015-05-08 10:12:40 -05:00
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