Commit graph

53 commits

Author SHA1 Message Date
Matthew Haughton
bbbb1ca130 Merge pull request #519 from 3flex/refactor-packages
Clean up package classes, allow installing mainline upstream packages
2014-12-14 21:25:56 -05:00
Sergio Ballesteros
1e3bf2fe88 Added test: arrays as values in http_cfg_append 2014-12-11 16:41:47 +01:00
Matthew Haughton
89b7480bfe package: mainline package support on redhat/debian
Closes #450
Closes #456
Closes #518
2014-12-10 21:23:04 -05:00
Matthew Haughton
1da7ffa6c1 package/redhat: don't ensure the yum repo file
The file wouldn't necessarily be at that location. According to Puppet it's installed in the first matching location:
* Custom directory specified by the ‘/etc/yum.conf’ reposdir property
* ‘/etc/yum/repos.d’
* ‘/etc/yum.repos.d’
* If none of these locations match, section will be created in ‘/etc/yum.conf’
2014-12-10 21:23:04 -05:00
Matthew Haughton
d16222d940 package: Differentiate between upstream's RedHat and CentOS packages
Even if they're currently identical they may diverge in future.
2014-12-10 21:23:04 -05:00
Matthew Haughton
029f73f4a2 package: removed a warning for Fedora 18 and below
Those versions no longer supported by the Fedora Project.
2014-12-10 21:23:04 -05:00
Matthew Haughton
4eea8c7397 package: install "nginx" package when OS isn't recognized
This will provide broader OS compatibility without having to manually add
support for specific OSes.
2014-12-10 21:23:01 -05:00
Matthew Haughton
1a10a23c1b package: don't install upstream package on Amazon Linux
Upstream doesn't provide a build of Nginx for Amazon Linux.
2014-12-09 21:49:40 -05:00
Matthew Haughton
1898182c6d spec: cleanup
* Removed some tests that no longer apply and/or are redundant
* Only set OS facts when testing OS-specific behaviors. This simplifies the
  facts that must be set in the specs and saves running the same tests
  several times when the results wouldn't differ by OS anyway.
2014-12-09 19:47:05 -05:00
Matthew Haughton
9647d1278f add negative test for log_format 2014-12-03 23:26:19 -05:00
Joshua B. Bussdieker
2e221a7e0f Support specifying log formats 2014-12-03 23:26:10 -05: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
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
Frederik Wagner
ad391f67bf added nginx_vhosts_defaults parameter hash 2014-09-15 23:11:26 -04:00
Carl P. Corliss
fb880576a6 cleanup resultant whitespace and key/value alignment in config files
- fix tests related to whitespace changes
2014-09-13 04:13:18 -04:00
Matthew Haughton
a002d8932e bug fixes surfaced by future parser
* concat::fragment requires 'order' to be a string
* init parameters added in #373 referred to wrong variable name in params.pp
* cannot perform regex match on a number, so make {fastcgi,proxy}_cache_levels
  a string by default
* bug fixed in test suite
2014-09-04 23:24:14 -04:00
Matthew Haughton
0adf7f7876 Merge pull request #378 from 3flex/rspec2.99-updates
Convert specs to RSpec 2.99.1 syntax with Transpec
2014-08-22 11:50:49 -04:00
Matthew Haughton
5aa2f66ca3 Correct errors introduced by using latest apt module
Since librarian-puppet had locked to old versions of Forge modules
but puppetlabs_spec_helper is now pulling the latest version,
there's this incompatibility to take care of in the test suite.
2014-08-18 22:41:34 -04:00
Matthew Haughton
32bc360d45 Convert specs to RSpec 2.99.1 syntax with Transpec
This conversion is done by Transpec 2.3.4 with the following command:
    transpec -c "rake spec" spec/classes/ spec/defines/ spec/spec_helper.rb

* 210 conversions
    from: it { should ... }
      to: it { is_expected.to ... }

* 19 conversions
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

* 15 conversions
    from: == expected
      to: eq(expected)

* 15 conversions
    from: obj.should
      to: expect(obj).to

For more details: https://github.com/yujinakayama/transpec#supported-conversions
2014-07-17 22:28:38 -04:00
Motiejus Jakštys
0a1dacf605 Allow using $http_cfg_append with list of lists
It should be possible to include array of arrays in order to have
duplicate configuration keys (when permitted), like:

    nginx::http_cfg_append:
        - [include, /etc/nginx/vhosts/*.ngx]
        - [include, /etc/nginx/vhosts/*/*.ngx]
2014-07-01 06:35:20 +02:00
James Fryman
473ed04463 Merge pull request #354 from janorn/temp_paths
Add client_body_temp_path and proxy_temp_path to proxy.conf.
2014-06-24 09:27:18 -05:00
Jan Örnstedt
65c90f1999 Added tests for
pid
http_tcp_nodelay
http_tcp_nopush
keepalive_timeout
2014-06-24 01:41:22 +02:00
Jan Örnstedt
ebd2a6a608 Add client_body_temp_path and proxy_temp_path to proxy.conf. 2014-06-24 00:33:56 +02:00
Robin Gloster
dc1b4b528c fix tests 2014-06-20 16:35:23 +02:00
Lee Packham
8eb26b792b Fix all rspec tests so they run
For some reason these have been broken forever. Travis was failing,
correctly. I have updated the tests to be correct to how the code
actually works.

I would also suggest that if this is merged, we stop merging PRs that
have failed test runs. Tests matter in a module like this.
2014-06-10 22:10:00 +01:00
Dominic Luechinger
43a5e7d6ff Added nginx::resource::mailhost to be configured via hiera
There is a slight chance the SSL 'concat::fragment' of the mailhost and
virtualhost are get in the way, if the name is declared the same.
2014-04-08 00:36:36 +02:00
James Fryman
15506a5f98 Merge pull request #275 from gini/worker_rlimit_nofile
New parameter worker_rlimit_nofile
2014-03-17 12:54:07 -05:00
James Fryman
e59468a71f Merge pull request #264 from welterde/feature-service_disable
add service_ensure support
2014-03-17 12:29:02 -05:00
Daniel Kerwin
04b6c3dd7d Test worker_rlimit_nofile 2014-03-12 18:41:03 +01:00
Zdenek Janda
58818b3a44 Ensure that vhosts are purged with new parameter purge_vhost 2014-03-07 22:18:10 +01:00
Tassilo Schweyer
b2d586d758 remove duplicate ref to params in nginx::service 2014-03-04 17:46:45 +01: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
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
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
2459844373 add puppetlabs-concat dependency 2013-11-30 20:33:10 -05:00
Matthew Haughton
c8d9ad5680 only ensure yum repo file when yum repo created 2013-11-21 22:40:05 -05:00
Matthew Haughton
962fa6672a rspec tests for v0.0.6
Resolves #65
2013-11-21 22:14:00 -05:00
Matthew Haughton
3959823171 check apt::source in catalog, not the file it creates
We should trust the apt module to do the right thing,
and just test that apt::source is part of the catalogue.
2013-10-20 21:54:32 -04:00
Matthew Haughton
0da2fa17ea apt modules relies on lsbdistcodename fact 2013-10-20 21:43:33 -04:00
Matthew Haughton
a24e160024 fix specs for PR #158 2013-10-20 21:28:15 -04:00
Ashley Penney
8ddc6f6ccf This commit allows you to set package_ensure in nginx and have that
trickle through to the package classes.  I've avoided making them
into paramaterized classes and we just refer directly back to the main
nginx namespace to get the variable.  Makes for a cleaner looking
module!
2013-09-04 13:29:30 -04:00