Commit Graph

530 Commits

Author SHA1 Message Date
Imran Iqbal
08ce3edf9f ci: merge travis matrix, add salt-lint & rubocop to lint job
* Semi-automated using https://github.com/myii/ssf-formula/pull/60
2019-10-09 14:45:57 +01:00
Imran Iqbal
06d055e220
fix(pkg.sls): fix salt-lint errors
```bash
Examining nginx/pkg.sls of type state
[201] Trailing whitespace
nginx/pkg.sls:149
    - gpgcheck: 0
```
2019-10-09 14:44:45 +01:00
Imran Iqbal
0772d8a8d0
fix(map.jinja): fix salt-lint errors
```bash
Examining nginx/map.jinja of type state
[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:175
})%}

[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:181
})%}

[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:188
})%}

[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:192
    })%}

[202] Jinja statement should have spaces before and after: {% statement %}
nginx/map.jinja:195
    })%}
```
2019-10-09 14:44:45 +01:00
Imran Iqbal
bedc1b6c90
fix(certificates.sls): fix salt-lint errors
```bash
Examining nginx/certificates.sls of type state
[206] Jinja variables should have spaces before and after: {{ var_name }}
nginx/certificates.sls:40
    - contents_pillar: {{salt['pillar.get']('nginx:certificates:{}:public_cert_pillar'.format(domain))}}

[202] Jinja statement should have spaces before and after: {% statement %}
nginx/certificates.sls:47
{% if salt['pillar.get']("nginx:certificates:{}:private_key".format(domain)) or salt['pillar.get']("nginx:certificates:{}:private_key_pillar".format(domain))%}

[206] Jinja variables should have spaces before and after: {{ var_name }}
nginx/certificates.sls:54
    - contents_pillar: {{salt['pillar.get']('nginx:certificates:{}:private_key_pillar'.format(domain))}}
```
2019-10-09 14:44:45 +01:00
Imran Iqbal
567c08c9ad ci: merge travis matrix, add salt-lint & rubocop to lint job
* Automated using https://github.com/myii/ssf-formula/pull/60
2019-10-08 16:38:47 +01:00
Imran Iqbal
402f6f2305 chore(yamllint): update ignored paths and add octal-values [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/59
2019-10-07 19:34:42 +01:00
Imran Iqbal
88bfbce12c chore(issues): update Bug report & Feature request templates [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/58
2019-10-07 15:29:02 +01:00
Imran Iqbal
714f547e9a
docs(pillar.example): fix TOFS comment to explain the default path [skip ci]
* Replace the Jinja brackets to avoid evaluating when `pillar.example` is
  used from Kitchen
* References:
  - https://github.com/saltstack-formulas/libvirt-formula/pull/60#issuecomment-537965254
  - https://github.com/saltstack-formulas/libvirt-formula/pull/60#issuecomment-537988138
2019-10-03 19:27:37 +01:00
Imran Iqbal
17291a0ae2 ci(kitchen): install required packages to bootstrapped opensuse [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/53
2019-10-02 00:09:57 +01:00
Imran Iqbal
a39e124761 ci(kitchen): use bootstrapped opensuse images until 2019.2.2 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/52
2019-10-01 21:36:50 +01:00
Imran Iqbal
b335ee5eb2 chore(issues): provide Bug report & Feature request templates [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/48
2019-09-30 16:02:00 +01:00
Niels Abspoel
48af42ed59
Merge pull request #256 from myii/chore/standardise-structure
ci(platform): add `arch-base-latest`
2019-09-25 19:57:36 +02:00
Imran Iqbal
671a4ce984 ci(kitchen): change log_level to debug instead of info
* Automated using https://github.com/myii/ssf-formula/pull/41
2019-09-23 17:02:45 +01:00
Imran Iqbal
c921086d49 ci(platform): add arch-base-latest
* Automated using https://github.com/myii/ssf-formula/pull/40
2019-09-22 22:40:44 +01:00
Niels Abspoel
ae1bd8dc2a
Merge pull request #255 from myii/chore/standardise-structure
ci(yamllint): add rule `empty-values` & use new `yaml-files` setting
2019-09-12 18:26:13 +02:00
Imran Iqbal
3d48b1b6bb
ci(yamllint): add rule empty-values & use new yaml-files setting
* Semi-automated using https://github.com/myii/ssf-formula/pull/27
* Fix errors shown below:

```bash
nginx-formula$ yamllint -s .
./pillar.example
  146:56    error    empty value in block mapping  (empty-values)
  147:76    error    empty value in block mapping  (empty-values)
  148:59    error    empty value in block mapping  (empty-values)
  150:22    error    empty value in block mapping  (empty-values)
  151:39    error    empty value in block mapping  (empty-values)
  152:39    error    empty value in block mapping  (empty-values)
  153:39    error    empty value in block mapping  (empty-values)
```
2019-09-10 22:44:25 +01:00
Niels Abspoel
50ea0e789a
Merge pull request #254 from myii/chore/standardise-structure
ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround
2019-09-08 21:43:08 +02:00
Imran Iqbal
8ddb921af1 ci: use dist: bionic & apply opensuse-leap-15 SCP error workaround
* Automated using https://github.com/myii/ssf-formula/pull/22
2019-09-07 03:40:56 +01:00
semantic-release-bot
9a700ca0bd chore(release): 2.3.0 [skip ci]
# [2.3.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.2.1...v2.3.0) (2019-09-01)

### Continuous Integration

* **kitchen+travis:** replace EOL pre-salted images ([70e1426](https://github.com/saltstack-formulas/nginx-formula/commit/70e1426))

### Features

* **passenger:** inc config, snippets, servers, etc ([e07b558](https://github.com/saltstack-formulas/nginx-formula/commit/e07b558))
2019-09-01 19:22:39 +00:00
Niels Abspoel
4be3109749
Merge pull request #246 from ErisDS/passenger-plus
Included snippets, servers & certs for passenger
2019-09-01 21:13:09 +02:00
Niels Abspoel
09305d213b
Merge pull request #253 from myii/chore/standardise-structure
ci(kitchen+travis): replace EOL pre-salted images
2019-09-01 11:42:47 +02:00
Imran Iqbal
70e142692d ci(kitchen+travis): replace EOL pre-salted images
* Automated using https://github.com/myii/ssf-formula/pull/16
2019-08-28 07:42:06 +01:00
semantic-release-bot
4d4806fb3b chore(release): 2.2.1 [skip ci]
## [2.2.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.2.0...v2.2.1) (2019-08-25)

### Documentation

* **readme:** update testing section ([182f216](https://github.com/saltstack-formulas/nginx-formula/commit/182f216))
2019-08-25 20:04:26 +00:00
Nicolas Rodriguez
90f3849b40
Merge pull request #252 from n-rodriguez/wip/doc
docs(readme): update testing section
2019-08-25 21:52:26 +02:00
Nicolas Rodriguez
182f2169dc docs(readme): update testing section 2019-08-25 21:42:30 +02:00
Imran Iqbal
011bf32302
Merge pull request #251 from myii/chore/standardise-structure
chore: use `semantic-release` cross-formula standard structure
2019-08-17 16:49:28 +01:00
Imran Iqbal
34af78ad40 chore: use semantic-release cross-formula standard structure
* Automated using `ssf-formula` (v0.6.0)
2019-08-17 16:06:48 +01:00
semantic-release-bot
df649c997b chore(release): 2.2.0 [skip ci]
# [2.2.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.1.0...v2.2.0) (2019-08-12)

### Features

* **yamllint:** include for this repo and apply rules throughout ([6b7d1fe](https://github.com/saltstack-formulas/nginx-formula/commit/6b7d1fe))
2019-08-12 18:16:43 +00:00
Niels Abspoel
8b90eb1ec2
Merge pull request #250 from myii/chore/standardise-structure
feat(yamllint): include for this repo and apply rules throughout
2019-08-12 20:07:42 +02:00
Imran Iqbal
6b7d1fe453
feat(yamllint): include for this repo and apply rules throughout
* Semi-automated using `ssf-formula` (v0.5.0)
* Fix errors shown below:

```bash
nginx-formula$ $(grep "\- yamllint" .travis.yml | sed -e "s:^\s\+-\s\(.*\):\1:")
pillar.example
  5:1       warning  missing document start "---"  (document-start)
  6:89      error    line too long (110 > 88 characters)  (line-length)
  7:89      error    line too long (99 > 88 characters)  (line-length)
  19:89     error    line too long (132 > 88 characters)  (line-length)
  35:25     warning  truthy value should be one of [false, true]  (truthy)
  36:89     error    line too long (106 > 88 characters)  (line-length)
  40:89     error    line too long (115 > 88 characters)  (line-length)
  43:16     warning  truthy value should be one of [false, true]  (truthy)
  44:89     error    line too long (105 > 88 characters)  (line-length)
  48:16     warning  truthy value should be one of [false, true]  (truthy)
  54:14     warning  too few spaces before comment  (comments)
  57:13     warning  truthy value should be one of [false, true]  (truthy)
  57:18     warning  too few spaces before comment  (comments)
  58:14     warning  too few spaces before comment  (comments)
  60:5      warning  missing starting space in comment  (comments)
  60:89     error    line too long (96 > 88 characters)  (line-length)
  61:89     error    line too long (90 > 88 characters)  (line-length)
  62:89     error    line too long (90 > 88 characters)  (line-length)
  63:89     error    line too long (94 > 88 characters)  (line-length)
  64:5      warning  missing starting space in comment  (comments)
  64:89     error    line too long (96 > 88 characters)  (line-length)
  68:9      error    wrong indentation: expected 10 but found 8  (indentation)
  76:9      error    wrong indentation: expected 10 but found 8  (indentation)
  86:9      error    wrong indentation: expected 10 but found 8  (indentation)
  90:14     warning  too few spaces before comment  (comments)
  90:89     error    line too long (104 > 88 characters)  (line-length)
  92:6      warning  missing starting space in comment  (comments)
  92:89     error    line too long (106 > 88 characters)  (line-length)
  94:89     error    line too long (104 > 88 characters)  (line-length)
  97:6      warning  missing starting space in comment  (comments)
  97:89     error    line too long (106 > 88 characters)  (line-length)
  100:62    warning  too few spaces before comment  (comments)
  100:89    error    line too long (121 > 88 characters)  (line-length)
  101:62    warning  comment not indented like content  (comments-indentation)
  101:89    error    line too long (116 > 88 characters)  (line-length)
  102:89    error    line too long (112 > 88 characters)  (line-length)
  103:89    error    line too long (99 > 88 characters)  (line-length)
  105:89    error    line too long (124 > 88 characters)  (line-length)
  106:8     warning  missing starting space in comment  (comments)
  106:89    error    line too long (117 > 88 characters)  (line-length)
  112:89    error    line too long (97 > 88 characters)  (line-length)
  120:31    warning  missing starting space in comment  (comments)
  123:89    error    line too long (95 > 88 characters)  (line-length)
  127:13    error    wrong indentation: expected 14 but found 12  (indentation)
  151:33    warning  too few spaces before comment  (comments)
  151:89    error    line too long (94 > 88 characters)  (line-length)
  152:22    warning  too few spaces before comment  (comments)
  152:89    error    line too long (90 > 88 characters)  (line-length)
  153:21    warning  too few spaces before comment  (comments)
  153:89    error    line too long (101 > 88 characters)  (line-length)
  154:22    warning  too few spaces before comment  (comments)
  155:18    warning  too few spaces before comment  (comments)
  155:89    error    line too long (103 > 88 characters)  (line-length)
  163:89    error    line too long (100 > 88 characters)  (line-length)
  164:89    error    line too long (106 > 88 characters)  (line-length)
  165:18    warning  truthy value should be one of [false, true]  (truthy)
  167:89    error    line too long (109 > 88 characters)  (line-length)
  170:10    warning  missing starting space in comment  (comments)
  172:10    warning  missing starting space in comment  (comments)
  172:89    error    line too long (120 > 88 characters)  (line-length)
  173:10    warning  missing starting space in comment  (comments)
  173:89    error    line too long (118 > 88 characters)  (line-length)
  174:89    error    line too long (120 > 88 characters)  (line-length)
  175:20    warning  truthy value should be one of [false, true]  (truthy)
  175:89    error    line too long (102 > 88 characters)  (line-length)
  177:89    error    line too long (100 > 88 characters)  (line-length)
  178:89    error    line too long (101 > 88 characters)  (line-length)
  182:13    error    wrong indentation: expected 14 but found 12  (indentation)
  184:15    error    wrong indentation: expected 16 but found 14  (indentation)
  186:15    error    wrong indentation: expected 16 but found 14  (indentation)
  189:15    error    wrong indentation: expected 16 but found 14  (indentation)
  193:9     warning  comment not indented like content  (comments-indentation)
  196:13    error    wrong indentation: expected 14 but found 12  (indentation)
  198:15    error    wrong indentation: expected 16 but found 14  (indentation)
  202:15    error    wrong indentation: expected 16 but found 14  (indentation)
  206:9     warning  comment not indented like content  (comments-indentation)
  218:16    warning  too few spaces before comment  (comments)
  218:89    error    line too long (96 > 88 characters)  (line-length)
  219:18    warning  truthy value should be one of [false, true]  (truthy)
  223:57    warning  too few spaces before comment  (comments)
  223:89    error    line too long (111 > 88 characters)  (line-length)
  224:57    warning  comment not indented like content  (comments-indentation)
  224:89    error    line too long (118 > 88 characters)  (line-length)
  226:89    error    line too long (90 > 88 characters)  (line-length)
  236:18    warning  truthy value should be one of [false, true]  (truthy)
  245:89    error    line too long (108 > 88 characters)  (line-length)
  252:89    error    line too long (104 > 88 characters)  (line-length)
  305:89    error    line too long (115 > 88 characters)  (line-length)
  306:32    error    trailing spaces  (trailing-spaces)

test/salt/default/pillar/nginx.sls
  1:1       error    too many blank lines (1 > 0)  (empty-lines)
  7:1       warning  missing document start "---"  (document-start)
  11:9      error    wrong indentation: expected 10 but found 8  (indentation)
  23:18     warning  truthy value should be one of [false, true]  (truthy)
  24:18     warning  truthy value should be one of [false, true]  (truthy)
  28:18     warning  truthy value should be one of [false, true]  (truthy)
  31:13     error    wrong indentation: expected 14 but found 12  (indentation)
  33:15     error    wrong indentation: expected 16 but found 14  (indentation)
  36:15     error    wrong indentation: expected 16 but found 14  (indentation)
  38:1      error    too many blank lines (1 > 0)  (empty-lines)
```
2019-08-12 14:40:12 +01:00
semantic-release-bot
c00c058076 chore(release): 2.1.0 [skip ci]
# [2.1.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.0.0...v2.1.0) (2019-08-04)

### Continuous Integration

* **kitchen+travis:** modify matrix to include `develop` platform ([f6b357d](https://github.com/saltstack-formulas/nginx-formula/commit/f6b357d))

### Features

* **linux:** archlinux support (no osfinger grain) ([ab6148c](https://github.com/saltstack-formulas/nginx-formula/commit/ab6148c))
2019-08-04 19:41:04 +00:00
Niels Abspoel
82edc41695
Merge pull request #249 from noelmcloughlin/arch
feat(linux): archlinux support (no osfinger grain)
2019-08-04 21:23:29 +02:00
N
ab6148c064
feat(linux): archlinux support (no osfinger grain) 2019-08-03 14:53:49 +01:00
Imran Iqbal
6c89ef50cf
Merge pull request #248 from myii/ci/standardise-structure
chore: use `semantic-release` cross-formula standard structure
2019-07-25 10:08:26 +01:00
Imran Iqbal
022345da76 chore: use semantic-release cross-formula standard structure
* Automated using `ssf-formula` (v0.1.0-rc.2)
2019-07-25 09:37:25 +01:00
Niels Abspoel
e80e0806bb
Merge pull request #244 from myii/ci/standardise-structure
chore: use `semantic-release` cross-formula standard structure
2019-07-23 21:05:24 +02:00
Hannah Wolfe
e07b5582dc feat(passenger): inc config, snippets, servers, etc
- currently you're forced to define extra states if you opt to install nginx with passenger,
 if you want the same outcome for passenger and nginx installs with equivalent config
- passenger is an extra module on top of nginx, makes no sense to end up with less configuration by default
2019-07-23 14:14:34 +01:00
Imran Iqbal
73da429b77
chore: use semantic-release cross-formula standard structure
* Automated using `ssf-formula` (v0.1.0-rc.1)
2019-07-23 04:12:41 +01:00
N
def06188a9
Merge pull request #245 from ErisDS/patch-1
tofs: include path pattern with defaults in docs
2019-07-22 20:28:25 +01:00
Hannah Wolfe
c76ffa660e
tofs: include path pattern with defaults in docs 2019-07-22 19:40:53 +01:00
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