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

408 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jason Clark
c7566d9134 Fix for order statements. Concat requires strings 2013-12-17 22:12:31 -06:00
James Fryman
df8df800eb Merge pull request #195 from bionix/bionix_autoindex_locations 
Add nginx autoindex to resource nginx::location and style up the nginx::vhost directory template
 2013-12-17 10:51:34 -08:00
Markus Rekkenbeil
b79259ed8b Add nginx autoindex to resource nginx::location and style up the 
nginx::vhost directory template

Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
 2013-12-16 17:36:24 +01:00
James Fryman
1233413bc2 Merge pull request #194 from bionix/bionix_autoindex 
Add nginx::vhost option 'autoindex'
 2013-12-12 12:56:41 -08:00
Markus Rekkenbeil
b7986f3dc3 Add nginx::vhost option 'autoindex' 
Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
 2013-12-12 17:27:29 +01:00
James Fryman
3db9511779 Merge pull request #192 from 3flex/rspec-puppet-1.0.0 
rspec-puppet 1.0.0
 2013-12-09 07:07:25 -08:00
James Fryman
4ae2f81b8f Merge pull request #175 from 3flex/fix-template-deprecations 
(maint) Fix Puppet 3.2.x deprecation warnings
 2013-12-09 07:06:50 -08:00
Matthew Haughton
8bd2acb344 remove deprecated rspec-system-serverspec includes 
See https://github.com/puppetlabs/rspec-system-serverspec/pull/11
 2013-12-08 17:09:03 -05:00
Matthew Haughton
a0258920d1 Fix Puppet 3.2.x deprecation warnings 2013-12-08 17:01:12 -05:00
Matthew Haughton
7d9d69c0bc add new compile matcher 2013-12-08 16:54:25 -05:00
Matthew Haughton
17baf0861c add relationship matchers 2013-12-08 16:54:25 -05:00
Matthew Haughton
fb46e3b8cb refactor nginx_spec 2013-12-08 16:54:25 -05:00
Matthew Haughton
58b5f52685 more stringent tests for config file resources 2013-12-08 16:54:25 -05:00
Matthew Haughton
26d904c946 use new 'without_content' matcher 2013-12-08 16:54:20 -05:00
Matthew Haughton
37c12b8cb4 use new count matchers in params class 2013-12-07 13:39:24 -05:00
Matthew Haughton
36319cd5e0 set default facts for all manifests 2013-12-07 13:39:24 -05:00
Matthew Haughton
db68cf39ae include_class is deprecated 2013-12-07 13:39:24 -05:00
Matthew Haughton
23150bf8c2 boost rspec-puppet version 2013-12-07 12:34:05 -05:00
James Fryman
7c1674202a Merge pull request #170 from TelekomCloud/feature/set_proxy_method_and_body 
Add support for proxy method and body
 2013-12-05 07:48:18 -08:00
James Fryman
383087f543 Merge pull request #167 from 3flex/concat 
Switch to using concat{} instead of lots of file{} magic.
 2013-12-03 13:11:06 -08:00
Matthew Haughton
390b491cc1 ruby 1.8.7 syntax fix 2013-12-02 14:01:38 -05:00
Matthew Haughton
2ccd399a74 add tests to check file fragments are absent 2013-12-02 13:58:23 -05:00
Matthew Haughton
486d03b685 required to remove unused file fragments from /tmp 2013-12-02 13:54:02 -05:00
Matthew Haughton
684fafc559 Remove the now unused file fragments from /tmp 2013-12-02 13:53:10 -05:00
Matthew Haughton
a9c445b3f9 Remove unused code in vhost 2013-12-02 13:50:22 -05:00
Matthew Haughton
0e1d4adbd5 Remove unused code in mailhost 2013-12-02 13:49:47 -05:00
Matthew Haughton
eb31df40d6 Remove vhost and mailhost vhost_autogen.conf 
Don't generate it anymore, and remove any existing file from
people's systems
 2013-11-30 21:24:55 -05:00
Matthew Haughton
d849c31c35 switch location resource to concat pattern 2013-11-30 21:24:55 -05:00
Matthew Haughton
753283286f switch vhost resource to concat pattern 
Also uses sites-available/enabled pattern for config files
 2013-11-30 21:24:50 -05:00
Matthew Haughton
2023ca1d6d switch mailhost resource to concat pattern 2013-11-30 21:21:40 -05:00
Matthew Haughton
2459844373 add puppetlabs-concat dependency 2013-11-30 20:33:10 -05:00
Matthew Haughton
9a39249e1a more coverage for rspec-system 2013-11-30 20:33:06 -05:00
Matthew Haughton
dd810866d0 add dummy (but valid) SSL cert/key 
nginx won't start if it can't get OpenSSL to validate the key/cert combo
 2013-11-30 19:11:12 -05:00
Matthew Haughton
0922eb7210 check for 0 or 2 exit code 
See http://docs.puppetlabs.com/man/apply.html

puppet_apply from rspec-system-puppet runs with --detailed-exitcodes
 2013-11-30 19:11:00 -05:00
Matthew Haughton
d2ec91da6e Don't include RSpecSystemPuppet::Helpers twice 2013-11-30 17:57:32 -05:00
Matthew Haughton
a42f971fa6 remove SLES 11 from nodeset 
Doesn't work with current rspec-system-puppet gem (no puppet_install helper
support)
 2013-11-30 17:53:52 -05:00
Matthew Haughton
2533623695 lock serverspec to 0.11.x 
required to work around
https://github.com/puppetlabs/rspec-system-serverspec/issues/6
 2013-11-30 17:52:45 -05:00
Matthew Haughton
65168203cf no more Gemfile.lock 
It messes with rspec-system builds and isn't really relevant
for code that's running directly on Puppet
 2013-11-30 17:52:01 -05:00
Dominik Richter
aa611dc938 added specs for proxy_method and proxy_set_body 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-28 11:42:34 +01:00
Dominik Richter
709c25e82e simplified checks if variables are set in vhost_location_proxy template 
kudos to Matthew Haughton for this suggestion

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 19:56:04 +01:00
Dominik Richter
a83c513ac4 feature: add configurable proxy_set_body to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
Dominik Richter
a578dcea50 feature: add configurable proxy_method to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
James Fryman
8691db1c83 Merge pull request #188 from 3flex/rspec-tests 
Rspec tests (and fixes)
 2013-11-22 09:27:53 -08:00
James Fryman
abc3093188 Merge pull request #183 from drfeelngood/nx_daemon_user_for_oracle_linux 
Update params to account for oracle linux.
 2013-11-22 09:27:22 -08:00
Matthew Haughton
8292be0748 set required variables before template declared 
correctly sets www_root in the vhost_header template
 2013-11-21 23:23:45 -05:00
Matthew Haughton
43d628d4f0 fix auth_basic/auth_basic_user_file variable detection 2013-11-21 23:22:01 -05:00
Matthew Haughton
99e9d82f12 accept boolean for ipv6_enable as documented 2013-11-21 23:18:04 -05:00
Matthew Haughton
e1c4c7470b sort vhost_cfg_append in vhost_ssl_footer 2013-11-21 23:08:36 -05:00
Matthew Haughton
4af2087867 fix spacing issues in various templates 
Before this change, vhost_ssl_header would merge
"ssl" with any listen options, e.g.:
    listen       *:443 ssldefault;
when listen_options => 'default'.
 2013-11-21 23:04:39 -05:00
Matthew Haughton
c8d9ad5680 only ensure yum repo file when yum repo created 2013-11-21 22:40:05 -05:00