Commit Graph

588 Commits

Author SHA1 Message Date
Javier Bértoli
1c83b6d5fa test(snippets): add tests for snippets includes
based on #275

fixes #274
2021-06-14 15:00:20 -03:00
Javier Bértoli
c55120acf2
Merge pull request #275 from anderbubble/issues/274
Ignore missing servers or snippets when removing from map
2021-06-14 14:47:55 -03:00
Imran Iqbal
0cd7c7b205
fix(certificates): ensure openssl installed before cmd.run
Fix failure highlighted on OpenSUSE Tumbleweed, where the `cmd.run` runs
before the `pkg.installed`:

* https://gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819#L2830
2021-06-14 18:31:06 +01:00
Jonathon Anderson
6cb486dbd2
fix(snippets): ignore servers or snippets when undefined
nginx.servers_config wants a lightened copy of the nginx map
to render as json; but, when it was trying to remove the
servers and snippets keys from the map it assumed their presence,
causing a KeyError if they were not present by its use of .pop().

While wrapping these in an "if" clause would likely be more
correct, along with replacing .pop() with del (if jinja even
supports that) the simplest change here is to just specify a
default value for .pop(), which obviates the KeyError.

Fixes #274
2021-06-14 16:25:23 +01:00
Imran Iqbal
a55f741901
chore(pre-commit): use info report level for rstcheck [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/325
2021-05-20 14:08:42 +01:00
semantic-release-bot
30a33700d7 chore(release): 2.7.1 [skip ci]
## [2.7.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.0...v2.7.1) (2021-05-12)

### Bug Fixes

* **servers:** wrong conditional specification ([494b2fb](494b2fbea4))

### Continuous Integration

* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([4697152](46971528d7))
2021-05-12 16:40:49 +00:00
Imran Iqbal
d160f10fe4
Merge pull request #283 from netmanagers/fix-conditional
fix(servers): wrong conditional specification
2021-05-12 17:29:12 +01:00
Javier Bértoli
494b2fbea4 fix(servers): wrong conditional specification 2021-05-12 12:09:29 -03:00
Imran Iqbal
46971528d7
ci: add arch-master to matrix and update .travis.yml [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/323
2021-05-09 22:31:44 +01:00
semantic-release-bot
49fb7eae7a chore(release): 2.7.0 [skip ci]
# [2.7.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.3...v2.7.0) (2021-04-28)

### Continuous Integration

* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([46faf4e](46faf4e24b))
* **vagrant:** add FreeBSD 13.0 [skip ci] ([b41062e](b41062e3b1))
* **vagrant:** use pre-salted boxes & conditional local settings [skip ci] ([b9e9cd3](b9e9cd38e6))

### Documentation

* **readme:** add `Testing with Vagrant` section [skip ci] ([5727848](57278481de))

### Features

* **servers_config:** add require statement to manage dependencies ([622d22f](622d22f971))

### Tests

* **requires:** verify dependencies in vhosts ([6478143](64781431b9))
2021-04-28 14:53:21 +00:00
Javier Bértoli
6ec5bf2916
Merge pull request #278 from netmanagers/master
feat(servers_config): add require statement to manage dependencies
2021-04-28 11:43:14 -03:00
Javier Bértoli
64781431b9 test(requires): verify dependencies in vhosts 2021-04-28 10:56:22 -03:00
Javier Bértoli
622d22f971 feat(servers_config): add require statement to manage dependencies
Also, check config before applying
2021-04-28 09:37:34 -03:00
Imran Iqbal
46faf4e24b
ci(kitchen+gitlab): adjust matrix to add 3003 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/318
2021-04-23 08:47:33 +01:00
Imran Iqbal
b41062e3b1
ci(vagrant): add FreeBSD 13.0 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/316
2021-04-20 00:21:49 +01:00
Imran Iqbal
b9e9cd38e6
ci(vagrant): use pre-salted boxes & conditional local settings [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/311
2021-04-05 18:54:26 +01:00
Imran Iqbal
5f8afeec97
chore: update CODEOWNERS & .yamllint re: kitchen-vagrant [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/310
2021-04-05 18:19:59 +01:00
Imran Iqbal
57278481de
docs(readme): add Testing with Vagrant section [skip ci] 2021-04-03 13:40:50 +01:00
semantic-release-bot
13591c61c5 chore(release): 2.6.3 [skip ci]
## [2.6.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.2...v2.6.3) (2021-04-03)

### Bug Fixes

* **freebsd:** add `openssl` pkg and update all `default` tests ([4cd351a](4cd351adbc))

### Continuous Integration

* enable Vagrant-based testing using GitHub Actions ([c79ce9a](c79ce9a9ae))
2021-04-03 12:36:54 +00:00
Imran Iqbal
f1c43be73f
Merge pull request #282 from myii/ci/add-freebsd-vagrant-in-github-actions
ci: enable FreeBSD Vagrant-based testing using GitHub Actions
2021-04-03 13:28:28 +01:00
Imran Iqbal
c79ce9a9ae
ci: enable Vagrant-based testing using GitHub Actions
* Semi-automated using https://github.com/myii/ssf-formula/pull/308
2021-04-03 13:04:05 +01:00
Imran Iqbal
4cd351adbc
fix(freebsd): add openssl pkg and update all default tests 2021-04-03 13:04:05 +01:00
semantic-release-bot
1e5cd1108e chore(release): 2.6.2 [skip ci]
## [2.6.2](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.1...v2.6.2) (2021-03-30)

### Bug Fixes

* **servers_config:** fixup 05994e1 ([c03729a](c03729ae32))
2021-03-30 18:02:24 +00:00
Imran Iqbal
4cfc9f6015
Merge pull request #280 from toanju/fixup
fix(servers_config): fixup 05994e1
2021-03-30 18:52:53 +01:00
Tobias Jungel
c03729ae32 fix(servers_config): fixup 05994e1 2021-03-30 01:42:27 +02:00
semantic-release-bot
3722991fde chore(release): 2.6.1 [skip ci]
## [2.6.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.0...v2.6.1) (2021-03-29)

### Bug Fixes

* **servers_config:** remove service depedency ([05994e1](05994e1b17))

### Code Refactoring

* **servers_config:** remove unused loop ([3825557](3825557070))

### Continuous Integration

* **kitchen+ci:** include `passenger` suite [skip ci] ([0bbe686](0bbe68619f))

### Tests

* standardise use of `share` suite & `_mapdata` state [skip ci] ([8ea3c82](8ea3c82be3))
2021-03-29 14:25:37 +00:00
Imran Iqbal
5d7fc8d5ba
Merge pull request #277 from toanju/patch-1
fix(servers_config): remove service depedency
2021-03-29 15:16:19 +01:00
Tobias Jungel
3825557070 refactor(servers_config): remove unused loop 2021-03-26 21:41:22 +01:00
Tobias Jungel
05994e1b17 fix(servers_config): remove service depedency
* servers_config should run without service dependency. Service is
  managed in servers.sls.
* dropped nginx_service_reload in favor of extending nginx_service
* wait for all file states (create and delete)
* create dirs for symlinked files
2021-03-26 21:40:33 +01:00
Imran Iqbal
8ea3c82be3
test: standardise use of share suite & _mapdata state [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/302
2021-03-23 21:30:37 +00:00
Javier Bértoli
0bbe68619f
ci(kitchen+ci): include passenger suite [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/303
2021-03-23 12:27:25 +00:00
semantic-release-bot
1d9a15fe49 chore(release): 2.6.0 [skip ci]
# [2.6.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.5.0...v2.6.0) (2021-03-11)

### Bug Fixes

* **passenger:** various fixes ([7271c9d](7271c9d16c))
* **pkg:** add inline EPEL repo configuration for Amazon Linux 2 ([ae6375c](ae6375cccc))

### Continuous Integration

* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([123d13e](123d13e2f4))
* **kitchen+ci:** make rubocop happy [skip ci] ([eedfc56](eedfc56b41))
* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([63d32a4](63d32a40b1))
* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([b4411c6](b4411c61d3))
* **pre-commit:** update hook for `rubocop` [skip ci] ([2a23743](2a23743fca))

### Features

* **config:** validate config before applying ([b396b24](b396b24fe4))

### Tests

* **config:** fix for Amazon Linux 2 & Oracle Linux 7/8 ([ab39c8f](ab39c8f7c3))
2021-03-11 17:20:41 +00:00
Javier Bértoli
a30001da35
Merge pull request #269 from netmanagers/master
Check nginx config before deploying & various passenger fixes
2021-03-11 14:09:15 -03:00
Javier Bértoli
eedfc56b41 ci(kitchen+ci): make rubocop happy [skip ci] 2021-03-11 13:41:37 -03:00
Javier Bértoli
7271c9d16c fix(passenger): various fixes
* correctly set dependencies in configuration
* update RPM repo key
* add tests for passenger installation as nginx module
* update test matrix
2021-03-11 13:35:24 -03:00
Javier Bértoli
b396b24fe4 feat(config): validate config before applying 2021-03-11 13:27:14 -03:00
Imran Iqbal
63d32a40b1
ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/299
2021-03-07 22:20:22 +00:00
Imran Iqbal
6dfe33e4ad
chore(yamllint): add .git/ to ignores [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/297
2021-03-05 18:33:28 +00:00
Daniel Dehennin
e2bab40761
chore(rubocop): allow use of YAML.load for _mapdata.rb [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/296
2021-02-23 21:49:24 +00:00
Dafydd Jones
cd60912213
chore(shellcheck): switch hook for shellcheck [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/295
2021-02-21 08:31:53 +00:00
Imran Iqbal
123d13e2f4
ci(gemfile+lock): use ssf customised kitchen-docker repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/294
2021-02-17 13:51:30 +00:00
Imran Iqbal
b4411c61d3
ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/293
2021-02-14 08:29:54 +00:00
Imran Iqbal
ab39c8f7c3
test(config): fix for Amazon Linux 2 & Oracle Linux 7/8 2021-02-14 08:24:16 +00:00
Imran Iqbal
ae6375cccc
fix(pkg): add inline EPEL repo configuration for Amazon Linux 2 2021-02-14 08:24:15 +00:00
Imran Iqbal
502e45b02f
chore: standardise structure (.gitignore & _mapdata.rb) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/292
2021-02-11 11:51:21 +00:00
Imran Iqbal
2a23743fca
ci(pre-commit): update hook for rubocop [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/290
2021-02-02 00:20:41 +00:00
semantic-release-bot
19203409ae chore(release): 2.5.0 [skip ci]
# [2.5.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.4.1...v2.5.0) (2021-01-04)

### Continuous Integration

* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([0ecd767](0ecd767e86))
* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([5c9f6d4](5c9f6d4d71))

### Features

* **context:** pass `nginx` to snippets and server_config contexts ([8641f0d](8641f0d79a))
2021-01-04 22:59:45 +00:00
sticky-note
9ce0e9891d
Merge pull request #271 from sticky-note/feat/context
feat(context): pass `nginx` to snippets and server_config contexts
2021-01-05 09:50:18 +11:00
Imran Iqbal
0ecd767e86
ci(commitlint): ensure upstream/master uses main repo URL [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/278
2020-12-20 18:47:34 +00:00
Imran Iqbal
5c9f6d4d71
ci(gitlab-ci): add rubocop linter (with allow_failure) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/277
2020-12-19 14:33:11 +00:00