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
James Fryman
515f4ed52e Merge pull request #509 from jfryman/convert-to-strings 
Adjust integers to strings.
 2014-11-24 11:32:19 -06:00
James Fryman
c87744aab9 Adjust integers to strings. 
As part of merging #501, default values for config.pp were integers. However,
many of the current logic expects to see strings for many values. This commit
fixes things up while the validation logic can be adjusted to take account
integer.
 2014-11-24 11:22:41 -06:00
Matthew Haughton
ced82375f1 Merge pull request #508 from PierreR/patch-2 
Remove deprecated comment
 2014-11-23 20:16:54 -05:00
Pi3r
4110c6b82b Deprecated comment. 
I believe the hiera backend `module_data` has been introduced in 0.1 and then dropped again in 0.2 (I don't know why exactly).

Is this correct ?

Anyhow, there is no `data` directory anymore. Please update the docs. I am not sure I can really trust any comment now ?
 2014-11-23 23:54:42 +01:00
James Fryman
c9b82e7f5a Merge pull request #501 from jfryman/rip-out-module-data 
Rip back out puppet-module-data
 2014-11-22 12:53:05 -06:00
James Fryman
0d939d3e13 fixing up specs/config parameters 2014-11-22 12:40:01 -06:00
James Fryman
12ece07bb4 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into rip-out-module-data 
Conflicts:
	docs/hiera.md
 2014-11-19 08:31:59 -06:00
James Fryman
cb5cb839c7 make sure to call the right variable for log_dir 2014-11-17 12:56:45 -06:00
James Fryman
45728b8f71 Merge branch 'rip-out-module-data' of https://github.com/jfryman/puppet-nginx into rip-out-module-data 2014-11-17 12:37:40 -06:00
James Fryman
785a5c9901 inherit params 2014-11-17 12:37:23 -06:00
Matthew Haughton
1f79a5d848 change logdir to log_dir when calling config from init 2014-11-17 12:20:51 -05:00
Matthew Haughton
26129e4881 Revert d08b1408 
Change was committed to wrong branch
 2014-11-17 12:20:11 -05:00
Matthew Haughton
d08b140832 change logdir to log_dir when calling config from init 2014-11-17 12:18:45 -05:00
Matthew Haughton
92f74a63f7 fixtures.yml: remove module_data fixture 2014-11-17 11:42:35 -05:00
James Fryman
9310f7e660 adjust default worker count 2014-11-17 09:28:51 -06:00
James Fryman
c8e2b0eeaf fix up mismatched params 2014-11-17 09:15:01 -06:00
James Fryman
486dcd76b2 Merge branch 'rip-out-module-data' of https://github.com/jfryman/puppet-nginx into rip-out-module-data 2014-11-17 09:11:29 -06:00
James Fryman
d57c787087 allow user to declare nginx::config per docs 2014-11-17 09:11:04 -06:00
Matthew Haughton
1eb0b126c4 Merge pull request #502 from cewood/vhost-whitespace 
Reorganise whitespace in the vhost header and location header/footer.
 2014-11-12 09:45:29 -05:00
James Fryman
3e8d0192b9 Merge pull request #504 from ripienaar/patch-1 
fix my name
 2014-11-12 07:35:47 -06:00
R.I.Pienaar
5e603abfc7 fix my name 2014-11-12 12:52:33 +01:00
Cameron Wood (@cewood)
123b14edca Reorganise whitespace in the vhost header and location header/footer. 
The current template inserts newlines after a location, which doesn't
seem logical; one can't assume there will always be more blocks that
follow. Therefore it is only logical to include the newline before a
new location block is inserted, which lends itself to the convention
of only prepending newlines to blocks, never appending them.
 2014-11-12 16:04:45 +11:00
Matthew Haughton
f3f2c60131 Delete hiera.yaml 2014-11-10 14:13:54 -05:00
Matthew Haughton
2bea3e7600 spec_helper: remove module-data-backend dependency 2014-11-10 14:13:27 -05:00
Matthew Haughton
95f3cf13ab config.pp: add missing comma 2014-11-10 14:11:14 -05:00
James Fryman
ce363ec310 add updated documentation 2014-11-08 17:59:03 +01:00
James Fryman
9e13a15542 remove all old docs on puppet-module-data 2014-11-08 17:39:36 +01:00
James Fryman
487c8cae2c Changing deprecation notice 2014-11-08 17:38:06 +01:00
James Fryman
ef5f04d474 rename parameter logdir -> log_dir 2014-11-08 17:24:26 +01:00
James Fryman
68a5094f7f cleanup puppet-module-data cruft 2014-11-08 17:22:55 +01:00
James Fryman
a070813cc1 extracted all variables back to params.pp pattern 2014-11-08 17:22:30 +01:00
James Fryman
050dad3f01 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into rip-out-module-data 2014-11-08 14:24:38 +01:00
Matthew Haughton
2917a35df4 hieradata: remove operatingsystemmajrelease 
Remove operatingsystemmajrelease from hieradata's hierarchy as it doesn't have a value
set on Ubuntu on anything lower than Facter 2.2. This means Ubuntu installations that
aren't running the most up to date Facter version would have compilation failures.

Fixes #497
 2014-11-03 12:07:16 -05:00
James Fryman
72a2461833 sync up data organization 2014-11-02 14:03:43 +01:00
James Fryman
6cf49ea0d4 sort parameters 2014-11-02 13:19:44 +01:00
James Fryman
035472208c seperate module/user parameters in config 2014-10-27 16:44:06 +01:00
James Fryman
859f4cbdb7 remove puppet-module-data dependency 2014-10-27 16:43:44 +01:00
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