 Matthew Haughton
|
c092c5a92a
Merge pull request #632 from jfryman/update-upstream-tests
|
9 years ago |
|
Matthew Haughton
|
c143078763
spec: update upstream_spec for puppetlabs-concat 2
|
9 years ago |
 Steve Maddison
|
58ef49662d
Merge pull request #1 from jfryman/master
|
9 years ago |
|
Matthew Haughton
|
9d456955c2
Merge pull request #623 from 3flex/599-ssl-updates
|
9 years ago |
|
Matthew Haughton
|
678a361106
vhost: add ssl_crl parameter
|
9 years ago |
|
Matthew Haughton
|
be4decdb78
vhost: don't copy any SSL files
|
9 years ago |
 James Fryman
|
086510c520
Merge pull request #398 from syscollective/master
|
9 years ago |
 Marin Vintila
|
a8cb664ef5
Fix uwsgi related tests
|
9 years ago |
|
Matthew Haughton
|
acf53e571b
Merge pull request #628 from 3flex/add-spec-test
|
9 years ago |
 Matthew Haughton
|
8fc4044162
spec: add some more nginx.conf tests
|
9 years ago |
|
Marin Vintila
|
66ee87b89e
Fix diff lines leftover from merge
|
9 years ago |
|
Marin Vintila
|
77aa952b20
Merge from master
|
9 years ago |
|
Marin Vintila
|
5624e4ca55
Merge from master
|
9 years ago |
|
Matthew Haughton
|
7c44738573
Merge pull request #627 from 3flex/quit-testing-on-ruby-1.8.7
|
9 years ago |
|
Matthew Haughton
|
a3e84acd82
travis: drop ruby 1.8.7 tests
|
9 years ago |
|
Matthew Haughton
|
f14da80814
Merge pull request #626 from 3flex/fail-on-lint-warnings
|
9 years ago |
|
Matthew Haughton
|
6f84e08bda
fix new lint issues
|
9 years ago |
|
Matthew Haughton
|
472af945d6
rake: fix syntax of fail_on_warnings lint setting
|
9 years ago |
|
Matthew Haughton
|
677ea5736c
Merge pull request #548 from joehillen/fix542
|
9 years ago |
 Joe Hillenbrand
|
2ff640d5dd
Include ssl settings in rewrite_www server.
|
9 years ago |
|
Matthew Haughton
|
8d1f4e42a3
Merge pull request #625 from Tombar/concat-fix
|
9 years ago |
 Martin Loy
|
7912f0074b
remove ensure from concat::fragment as its deprecated
|
9 years ago |
|
Martin Loy
|
952805aaeb
fix traling slash and aligment
|
9 years ago |
|
Martin Loy
|
72bb663caf
require vhost folder
|
9 years ago |
|
Martin Loy
|
23fe0404c8
require conf.d folder
|
9 years ago |
|
Matthew Haughton
|
3f95e281b9
Merge pull request #616 from Cofyc/cofyc_master
|
9 years ago |
|
Matthew Haughton
|
fd6b4cc088
Merge pull request #621 from 3flex/620-debian-8
|
9 years ago |
|
Matthew Haughton
|
5ffb235e21
params: support debian 8
|
9 years ago |
|
Matthew Haughton
|
b8454400ac
Merge pull request #613 from 3flex/test-on-puppet-4
|
9 years ago |
|
Matthew Haughton
|
d1ff642c44
Merge pull request #618 from mmarod/passenger_header
|
9 years ago |
