Commit Graph

440 Commits

Author SHA1 Message Date
Imran Iqbal
c539594b19
Merge pull request #242 from myii/ci/use-develop-image-in-matrix
ci(kitchen+travis): modify matrix to include `develop` platform
2019-06-25 23:14:23 +01:00
Imran Iqbal
f6b357d424
ci(kitchen+travis): modify matrix to include develop platform
* Use balanced matrix based on `template-formula` guidelines
2019-06-25 22:52:40 +01:00
semantic-release-bot
ae69ee4d8d chore(release): 2.0.0 [skip ci]
# [2.0.0](https://github.com/saltstack-formulas/nginx-formula/compare/v1.1.0...v2.0.0) (2019-06-19)

### Bug Fixes

* **snippets:** removed appending of ".conf" ([aa87721](https://github.com/saltstack-formulas/nginx-formula/commit/aa87721))

### BREAKING CHANGES

* **snippets:** Users have to modify their pillar
according to this commit. Users MUST append '.conf' for their
existing managed snippets.
2019-06-19 07:49:02 +00:00
N
f9000dd4f9
Merge pull request #240 from sticky-note/fix/snippets-file-name
fix(snippet-file-name): removed appending of ".conf" for snippets files
2019-06-19 08:33:27 +01:00
nb
aa87721bc2 fix(snippets): removed appending of ".conf"
(...) for snippets filename.
BREAKING CHANGE: Users have to modify their pillar
according to this commit. Users MUST append '.conf' for their
existing managed snippets.
2019-06-20 00:11:31 +11:00
semantic-release-bot
a5faf70c93 chore(release): 1.1.0 [skip ci]
# [1.1.0](https://github.com/saltstack-formulas/nginx-formula/compare/v1.0.5...v1.1.0) (2019-06-03)

### Features

* **tofs:** first implemetation + tplroot ([d5262ea](https://github.com/saltstack-formulas/nginx-formula/commit/d5262ea))
2019-06-03 22:41:09 +00:00
Imran Iqbal
f036e31b7f
Merge pull request #238 from sticky-note/master
feat(tofs): First implementation
2019-06-03 23:23:40 +01:00
Sammy
d5262ea5df feat(tofs): first implemetation + tplroot
First implementation of TOFS for:
nginx_config, passenger_config, servers_config and snippets
Introduced tplroot on modified files as well
Fixed GH link of nginx.conf file in docs/TOFS_pattern.rst
Fixed test for snippets name pillar
2019-06-04 08:57:21 +11:00
semantic-release-bot
b9f78aa957 chore(release): 1.0.5 [skip ci]
## [1.0.5](https://github.com/saltstack-formulas/nginx-formula/compare/v1.0.4...v1.0.5) (2019-05-13)

### Documentation

* **readme:** improve readme sections ([3cc3407](https://github.com/saltstack-formulas/nginx-formula/commit/3cc3407))
2019-05-13 20:56:59 +00:00
Nicolas Rodriguez
3cc3407cb5 docs(readme): improve readme sections 2019-05-13 21:39:51 +01:00
semantic-release-bot
8f89d6eec5 chore(release): 1.0.4 [skip ci]
## [1.0.4](https://github.com/saltstack-formulas/nginx-formula/compare/v1.0.3...v1.0.4) (2019-05-13)

### Bug Fixes

* prevent running of states deprecated in `v1.0.0` ([46dff15](https://github.com/saltstack-formulas/nginx-formula/commit/46dff15))
2019-05-13 12:20:31 +00:00
Imran Iqbal
46dff1596a fix: prevent running of states deprecated in v1.0.0
* Route all to `nginx/deprecated.sls`
2019-05-13 13:06:04 +01:00
semantic-release-bot
966efd3013 chore(release): 1.0.3 [skip ci]
## [1.0.3](https://github.com/saltstack-formulas/nginx-formula/compare/v1.0.2...v1.0.3) (2019-05-13)

### Documentation

* **readme:** add warning banner about `v1.0.0` breaking changes ([d553821](https://github.com/saltstack-formulas/nginx-formula/commit/d553821))
2019-05-13 01:59:29 +00:00
John Keates
a42df0f9d5
Merge pull request #235 from myii/chore/add-breaking-changes-warning-banner
docs(readme): add warning banner about `v1.0.0` breaking changes
2019-05-13 03:41:54 +02:00
Imran Iqbal
d553821caf
docs(readme): add warning banner about v1.0.0 breaking changes 2019-05-13 02:38:15 +01:00
semantic-release-bot
cbcf87db97 chore(release): 1.0.2 [skip ci]
## [1.0.2](https://github.com/saltstack-formulas/nginx-formula/compare/v1.0.1...v1.0.2) (2019-05-12)

### Documentation

* **readme:** update README, add badges ([adbac43](https://github.com/saltstack-formulas/nginx-formula/commit/adbac43))
2019-05-12 23:37:02 +00:00
Nicolas Rodriguez
adbac43775 docs(readme): update README, add badges 2019-05-13 00:23:44 +01:00
semantic-release-bot
181a5de661 chore(release): 1.0.1 [skip ci]
## [1.0.1](https://github.com/saltstack-formulas/nginx-formula/compare/v1.0.0...v1.0.1) (2019-05-12)

### Documentation

* remove obsolete CHANGELOG.rst file ([698aadb](https://github.com/saltstack-formulas/nginx-formula/commit/698aadb))
2019-05-12 19:46:00 +00:00
John Keates
2c5d67a751
Merge pull request #233 from noelmcloughlin/changelog
docs: remove obsolete CHANGELOG.rst file
2019-05-12 21:30:11 +02:00
N
698aadb911
docs: remove obsolete CHANGELOG.rst file 2019-05-12 20:23:30 +01:00
semantic-release-bot
fa99f05a39 chore(release): 1.0.0 [skip ci]
# [1.0.0](https://github.com/saltstack-formulas/nginx-formula/compare/v0.56.1...v1.0.0) (2019-05-12)

### Build System

* remove obsolete Makefile ([4961b04](https://github.com/saltstack-formulas/nginx-formula/commit/4961b04))

### Code Refactoring

* replace old `nginx` with `nginx.ng` ([0fc5070](https://github.com/saltstack-formulas/nginx-formula/commit/0fc5070))

### BREAKING CHANGES

* all previous `nginx` based configurations must be reviewed;
`nginx.ng` usage must be promoted to `nginx` and any uses of the original
`nginx` will have to be converted.
2019-05-12 16:27:17 +00:00
Eric Veiras Galisson
4961b04fcc build: remove obsolete Makefile 2019-05-12 17:13:17 +01:00
Eric Veiras Galisson
0fc507055d refactor: replace old nginx with nginx.ng
BREAKING CHANGE: all previous `nginx` based configurations must be reviewed;
`nginx.ng` usage must be promoted to `nginx` and any uses of the original
`nginx` will have to be converted.
2019-05-12 17:13:17 +01:00
semantic-release-bot
90d2601a8b chore(release): 0.56.1 [skip ci]
## [0.56.1](https://github.com/saltstack-formulas/nginx-formula/compare/v0.56.0...v0.56.1) (2019-04-27)

### Tests

* **inspec:** add test for `log_format` [#219](https://github.com/saltstack-formulas/nginx-formula/issues/219) ([4ed788e](https://github.com/saltstack-formulas/nginx-formula/commit/4ed788e))
2019-04-27 07:25:53 +00:00
Niels Abspoel
27711e2a34
Merge pull request #231 from myii/chore/test-log_format
test(inspec): add test for `log_format` #219
2019-04-27 09:08:22 +02:00
semantic-release-bot
c9815cabfd chore(release): 0.56.0 [skip ci]
# [0.56.0](https://github.com/saltstack-formulas/nginx-formula/compare/v0.55.1...v0.56.0) (2019-04-26)

### Features

* **`pillar.example`:** add stock `log_format` ([95ff308](https://github.com/saltstack-formulas/nginx-formula/commit/95ff308))
2019-04-26 16:02:48 +00:00
Garrett W
95ff308e7e feat(pillar.example): add stock log_format 2019-04-26 16:38:17 +01:00
Imran Iqbal
4ed788e5c7
test(inspec): add test for log_format #219 2019-04-26 16:33:37 +01:00
semantic-release-bot
36791727db chore(release): 0.55.1 [skip ci]
## [0.55.1](https://github.com/saltstack-formulas/nginx-formula/compare/v0.55.0...v0.55.1) (2019-04-26)

### Documentation

* **semantic-release:** implement an automated changelog ([569b07a](https://github.com/saltstack-formulas/nginx-formula/commit/569b07a))
2019-04-26 08:42:54 +00:00
Eric Veiras Galisson
1789cd3a32 WIP 2019-04-26 09:11:11 +01:00
Eric Veiras Galisson
569b07a696 docs(semantic-release): implement an automated changelog 2019-04-26 09:11:11 +01:00
Javier Bértoli
821deb97cb
Merge pull request #228 from myii/chore/ci-enable-py2-centos-7
ci(kitchen+travis): use `py2` instead of `py3` for `centos-7`
2019-04-19 16:01:20 -03:00
Imran Iqbal
2f6a7d4e6d
ci(kitchen+travis): use py2 instead of py3 for centos-7
* https://github.com/saltstack-formulas/salt-formula/pull/414
2019-04-19 19:29:25 +01:00
Imran Iqbal
c24d2b64d4 ci(travis): fix opensuse tests 2019-04-17 11:00:23 +01:00
Eric Veiras Galisson
7e737c1863 test(inspec): more tests on nginx config 2019-04-17 11:00:23 +01:00
Javier Bértoli
072a113454
Merge pull request #225 from saltstack-formulas/myii-patch-1
fix(gemfile): use latest `kitchen-salt`
2019-04-13 14:10:54 -03:00
Imran Iqbal
5d457d8b12
fix(gemfile): use latest kitchen-salt 2019-04-13 17:10:05 +01:00
Eric Veiras Galisson
f9e9d602d7 docs(README): remove obsolete tests section 2019-04-13 01:50:49 +01:00
Eric Veiras Galisson
35a81c8fb0 ci(travis): disabling CentOS7 tests for now 2019-04-12 22:29:20 +01:00
Eric Veiras Galisson
cd58d3b7ad ci(travis): update test matrix 2019-04-12 22:29:20 +01:00
Eric Veiras Galisson
b2bcb4c998 test(inspec): switch tests to use Inspec 2019-04-12 22:29:20 +01:00
Garrett W
62e8ac0b33 Pillar fixes (#217)
Squashed from:

* pillar.example: an include was missing a colon
* pillar.example: 2 directives not indented properly
* pillar.example: added the stock log_format
* pillar.example: make log path match map.jinja
* pillar.example: worker_connections value from latest mainline nginx
* pillar.example: fixed other uses of include
* pillar.example: corrected formatting
* pillar.example: corrected log_format
* pillar.example: reset log_format to try another day
2019-04-11 17:45:48 +01:00
Imran Iqbal
8ded496de6
Merge pull request #218 from daks/context-fix
fix: corrected indentation on context in file.managed states
2019-04-11 17:14:29 +01:00
Eric Veiras Galisson
cfed4ce2d1 fix: corrected indentation on context in file.managed states 2019-04-11 15:02:18 +02:00
Imran Iqbal
c604d501d6
Merge pull request #216 from sticky-note/fix/FreeBSD-default-snippets_dir
added default snippets directory for FreeBSD platform
2019-03-06 01:23:54 +00:00
sam
0ecdee9c35 added default snippets directory for FreeBSD platform 2019-03-06 11:43:03 +11:00
Niels Abspoel
f2068947cb
Merge pull request #215 from noelmcloughlin/fixes
Updated for Suse 15.0
2019-02-22 10:17:52 +01:00
N
cea121299e
Updated for Suse 15.0 2019-02-21 18:16:03 +00:00
Niels Abspoel
5006a2a8aa
Merge pull request #154 from M2Mobi/server_config_lists
Fix multiple values for the same key (include/listen) in server config file
2019-02-19 23:06:31 +01:00
Heinz Wiesinger
1541a59c83 Fix multiple values for the same key (include/listen) in server config file.
With this one can now also write

 - include:
   - file1
   - file2

Rather than only

 - include: file1
 - include: file2
2019-02-19 09:26:15 +01:00