Commit graph

892 commits

Author SHA1 Message Date
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
a5f9c1ebc1 hiera: set defaults to pass to nginx::service
Fixes #488
2014-10-23 15:29:54 -04:00
Matthew Haughton
05ac65f3b1 vhost: treat ssl_port as integer when comparing
Actual fix for test failure for code introduced in abe4b49
2014-10-23 14:12:20 -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
Matthew Haughton
b5d050719b metadata: correct license to match LICENSE.md
Fixes #466
2014-10-23 13:05:17 -04:00
Matthew Haughton
abe4b4952b vhost: fix rewrite to HTTPS for custom SSL ports
Fixes #477
2014-10-23 12:51:35 -04:00
Matthew Haughton
f432c27b9e Merge pull request #490 from vincentbernat/fix/blank-line-vhost-header
vhost: add a blank line at the end of the header template
2014-10-23 12:36:26 -04:00
Matthew Haughton
d2488fbeec Merge pull request #489 from actown/fix_init
puppet-lint: fix tabs and hash rocket alignment
2014-10-23 12:12:23 -04:00
Matthew Haughton
97331262c2 puppet-lint: don't check for documentation 2014-10-23 12:11:59 -04:00
Vincent Bernat
004ee68b89 vhost: add a blank line at the end of the header template
Without it, we get something like this:

```
  error_log             /var/log/nginx/my_error.log;  location / {
    root      /var/www/html;
  }
```

With this commit, we get this:

```
  error_log             /var/log/nginx/my_error.log;

  location / {
    root      /var/www/html;
  }
```
2014-10-22 22:22:46 +02: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
James Fryman
6d785b5346 Merge pull request #480 from actown/remove_ssl3
Remove the SSLv3 by default in the vhost resource.
2014-10-20 11:47:31 -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
Matthew Haughton
09337bac1c ensure puppetlabs_spec_helper 0.8.2+
0.8.2 has a fix for puppet-lint rake task broken in 0.8.1
2014-10-02 08:21:51 -04:00
Matthew Haughton
ac663b17be metadata: change 'source' to point to git repo
The docs say 'source' is "The source repository for your module." Using puppetlabs-apache
as an example the source repo has been updated to point to the git repository rather than
the GitHub webpage.
2014-09-26 16:39:13 -04:00
Matthew Haughton
b23c20b379 Pin puppetlabs_spec_helper to 0.8.0
0.8.1 has broken the 'rake lint' task which checks for style violations.
Unfortunately this means some have snuck in so this will break the build.

Revert when on merge of https://github.com/puppetlabs/puppetlabs_spec_helper/pull/78
2014-09-26 00:15:56 -04:00
James Fryman
42b427b6ca Merge pull request #464 from danieldreier/allow_internal_only
Allow internal-only location resources
2014-09-25 11:10:48 -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
cae0a44e37 bump to 0.1.1 2014-09-24 17:45:45 -07:00
James Fryman
d56c7c12f7 Merge pull request #461 from jfryman/add-additional-docs-module_data
Add instructions on bootstrapping puppet-module-data
2014-09-24 17:44:57 -07:00
James Fryman
6ac29a2d38 need to add instructions to configure and enable puppet-module-data 2014-09-24 17:40:19 -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
Matthew Haughton
60efadea7d Merge pull request #459 from pradermecker/pra
Guard against undef
2014-09-24 15:53:37 -04:00
Pierre Radermecker
0a46f25c3c Guard against undef 2014-09-24 02:06:15 +02:00
Matthew Haughton
8cd163391b Merge pull request #390 from cdenneen/patch-1
Add include files to locations. Closes #390
2014-09-23 18:56:00 -04: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
33dd9e2d96 Merge branch 'add-puppet-module-tool' of https://github.com/jfryman/puppet-nginx into add-puppet-module-tool 2014-09-23 10:42:21 -05:00
James Fryman
f5d456adf9 don't need this afterall 2014-09-23 10:41:37 -05:00
James Fryman
e31f2e49d4 Should use markdown link here. 2014-09-23 10:35:59 -05:00
James Fryman
9d2f48569f add blatant warning right up front for install/upgrade 2014-09-23 10:27:21 -05:00
James Fryman
d8b93ee156 remove package/service data from hiera 2014-09-23 10:23:37 -05:00
James Fryman
54230bc6a8 add more doc details 2014-09-23 10:23:15 -05:00
James Fryman
abe5824566 remove nginx::config and nginx::service deprecation notice 2014-09-23 09:11:22 -05:00
James Fryman
c1ae12d9cd remove kernel, use osfamily (h/t @3flex) 2014-09-22 20:35:01 -05:00
James Fryman
7a67a9d689 remove kernelversion/add osmajrelease 2014-09-22 20:08:10 -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
Matthew Haughton
f4ef3103a6 Merge pull request #454 from francis826/redhat_operatingsystemmajrelease
Fix to detect the major release version for redhat/centos 7
2014-09-21 12:03:10 -04:00
Matthew Haughton
801208533f add hiera.yaml to fixtures 2014-09-21 11:40:45 -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
678256fa3d need moar dashes 2014-09-20 13:34:20 -05:00
James Fryman
9bd63d348d Introducing Puppet Module Tool 2014-09-20 13:29:40 -05:00
James Fryman
d11d574e8c Merge pull request #443 from rabbitt/whitespace-cleanup
cleanup whitespace and key/value alignment in config files
2014-09-20 10:06:59 -05:00
James Fryman
6c19689273 Merge pull request #452 from 3flex/419-move-to-metadata-json
(maint) switch from Modulefile to metadata.json
2014-09-20 10:04:36 -05:00