saltstack-formulas/template-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/template-formula.git synced 2025-04-17 10:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
754 commits 4 branches 131 tags 1.6 MiB
Commit graph

754 commits

This branch
This branch
All branches
Author SHA1 Message Date
Imran Iqbal
726fcabc6d
docs(components): update for separation of pkg, config & service 2019-02-28 00:48:01 +00:00
Imran Iqbal
4443518a63
refactor(include+require): use variable for duplicate values 2019-02-28 00:48:01 +00:00
Imran Iqbal
d95705563c
refactor(components): split components into separate subdirs 
* Plan based upon the following comments:
  - https://github.com/saltstack-formulas/template-formula/pull/48#pullrequestreview-207182085
  - https://github.com/saltstack-formulas/template-formula/pull/48#discussion_r259805312
 2019-02-28 00:48:01 +00:00
Imran Iqbal
a218e914bc
refactor(topdir): use for include and require except init.sls 
* Make all `init.sls` imports relative since unnecessary there
 2019-02-28 00:48:00 +00:00
Imran Iqbal
2838bc9041
refactor(tpldir): use topdir globally in place of tpldir 
* `topdir` evaluates to the formula's root directory
* Maintains formula's portability by providing consistent navigation
 2019-02-28 00:48:00 +00:00
Imran Iqbal
422c7ac212
feat(pkg): add clean states 2019-02-28 00:48:00 +00:00
Imran Iqbal
6e7141babf
feat(pkg): use require requisite between pkg states 
* `tpldot` is the equivalent of `tpldir` but using `.` instead of `/`:
  - 0c78d7dc89/salt/utils/jinja.py (L120)
  - 0c78d7dc89/salt/utils/templates.py (L145)
* Implementation based on upstream issue:
  - https://github.com/saltstack/salt/issues/10838#issuecomment-391718086
 2019-02-28 00:48:00 +00:00
Imran Iqbal
c21f82b885
refactor(pkg): move pkg related components into separate directory 2019-02-28 00:47:59 +00:00
semantic-release-bot
be780db7f2 chore(release): 0.7.6 [skip ci] 
## [0.7.6](https://github.com/saltstack-formulas/template-formula/compare/v0.7.5...v0.7.6) (2019-02-27)

### Documentation

* **yaml:** os*.yaml map files needs at least an empty dict ([dd99750](https://github.com/saltstack-formulas/template-formula/commit/dd99750))
 2019-02-27 18:17:13 +00:00
Imran Iqbal
b5ffed0ce6
Merge pull request #60 from daks/doc-osyaml 
docs(yaml): os*.yaml map files needs at least an empty dict
 2019-02-27 18:05:51 +00:00
Eric Veiras Galisson
dd997506c0 docs(yaml): os*.yaml map files needs at least an empty dict 2019-02-27 17:06:32 +01:00
semantic-release-bot
6d01188d3e chore(release): 0.7.5 [skip ci] 
## [0.7.5](https://github.com/saltstack-formulas/template-formula/compare/v0.7.4...v0.7.5) (2019-02-27)

### Bug Fixes

* **pillar:** fix `os_family` typo ([3f89c12](https://github.com/saltstack-formulas/template-formula/commit/3f89c12))
* **tofs:** update comments in `files_switch` macro for new method ([3fa3640](https://github.com/saltstack-formulas/template-formula/commit/3fa3640))

### Code Refactoring

* **macros:** use `tplroot` instead of `topdir` to match `tpldata` ([923b459](https://github.com/saltstack-formulas/template-formula/commit/923b459))

### Documentation

* **tofs:** add more sub-headings to ease document navigation ([2c5dc21](https://github.com/saltstack-formulas/template-formula/commit/2c5dc21))
* **tofs:** apply language formatting to source code blocks ([0638413](https://github.com/saltstack-formulas/template-formula/commit/0638413))
* **tofs:** explain how all parts of the `source` can be customised ([2f82eb5](https://github.com/saltstack-formulas/template-formula/commit/2f82eb5)), closes [#44](https://github.com/saltstack-formulas/template-formula/issues/44)
* **tofs:** improve general use of language ([5105d29](https://github.com/saltstack-formulas/template-formula/commit/5105d29))
* **tofs:** update the `files_switch` section for the updated macro ([788f732](https://github.com/saltstack-formulas/template-formula/commit/788f732))
* **tofs:** use `{%-` for all Jinja statements ([4348df8](https://github.com/saltstack-formulas/template-formula/commit/4348df8))
 2019-02-27 05:20:08 +00:00
Imran Iqbal
b9c183150a
Merge pull request #57 from myii/PR_update-TOFSv2-docs 
TOFSv2: Update all documentation and inline comments as required
 2019-02-27 05:09:56 +00:00
Imran Iqbal
2f82eb54af
docs(tofs): explain how all parts of the source can be customised 
* Close #44.
 2019-02-27 04:52:10 +00:00
Imran Iqbal
0638413a59
docs(tofs): apply language formatting to source code blocks 2019-02-27 04:05:03 +00:00
Imran Iqbal
2c5dc21063
docs(tofs): add more sub-headings to ease document navigation 2019-02-27 03:55:40 +00:00
Imran Iqbal
788f732368
docs(tofs): update the files_switch section for the updated macro 2019-02-27 03:55:40 +00:00
Imran Iqbal
4348df8954
docs(tofs): use {%- for all Jinja statements 2019-02-27 03:55:40 +00:00
Imran Iqbal
5105d293d0
docs(tofs): improve general use of language 2019-02-27 03:55:34 +00:00
Imran Iqbal
3fa36402b7
fix(tofs): update comments in files_switch macro for new method 2019-02-27 03:55:06 +00:00
Imran Iqbal
923b459d9b
refactor(macros): use tplroot instead of topdir to match tpldata 2019-02-27 03:55:06 +00:00
Imran Iqbal
3f89c12248
fix(pillar): fix os_family typo 2019-02-27 03:55:06 +00:00
semantic-release-bot
c71915ed1e chore(release): 0.7.4 [skip ci] 
## [0.7.4](https://github.com/saltstack-formulas/template-formula/compare/v0.7.3...v0.7.4) (2019-02-27)

### Continuous Integration

* **kitchen:** check for repos updates before trying package installation ([b632383](https://github.com/saltstack-formulas/template-formula/commit/b632383))
* **kitchen+travis:** disable `debian-8` due to `2019.2` installation bug ([178c710](https://github.com/saltstack-formulas/template-formula/commit/178c710))

### Documentation

* **contributing:** separate `BREAKING CHANGE` under its own heading ([ee053d7](https://github.com/saltstack-formulas/template-formula/commit/ee053d7))
 2019-02-27 00:49:36 +00:00
Imran Iqbal
e8dcf7b9d7
Merge pull request #53 from saltstack-formulas/myii-patch-1 
docs(contributing): separate `BREAKING CHANGE` under its own heading
 2019-02-27 00:36:31 +00:00
Imran Iqbal
94aea7711c
Merge pull request #52 from daks/update 
ci(kitchen): check for repos updates before trying package installation
 2019-02-26 20:43:30 +00:00
Eric Veiras Galisson
b6323834e5 ci(kitchen): check for repos updates before trying package installation 2019-02-26 21:28:46 +01:00
Imran Iqbal
ee053d7b8c
docs(contributing): separate BREAKING CHANGE under its own heading 
* Explain that is should be formatted as a paragraph.
* Show an example of how to supply it.
 2019-02-26 18:57:07 +00:00
Imran Iqbal
6a4e25a509
Merge pull request #50 from myii/chore/disable-debian-8-ci 
ci(kitchen+travis): disable `debian-8` due to `2019.2` installation bug
 2019-02-25 21:51:41 +00:00
Imran Iqbal
178c7103f3 ci(kitchen+travis): disable debian-8 due to 2019.2 installation bug 
* https://github.com/saltstack/salt/issues/51808
 2019-02-25 21:51:15 +00:00
semantic-release-bot
ed00758133 chore(release): 0.7.3 [skip ci] 
## [0.7.3](https://github.com/saltstack-formulas/template-formula/compare/v0.7.2...v0.7.3) (2019-02-25)

### Bug Fixes

* **tofs:** use `tpldir` derivative `topdir` for pillar (config) paths ([5e9df00](https://github.com/saltstack-formulas/template-formula/commit/5e9df00))
 2019-02-25 14:06:35 +00:00
Imran Iqbal
2ffd36e62b
Merge pull request #49 from myii/bug/fix-files_switch-call 
fix(tofs): use `tpldir` derivative `topdir` for pillar (config) paths
 2019-02-25 13:51:30 +00:00
Imran Iqbal
5e9df004d9 fix(tofs): use tpldir derivative topdir for pillar (config) paths 
* With nested `.sls` files, `tpldir` respectively resolves to:
  - `template/<subdir>`
* Without this fix, only the default value provided is ever used, respectively:
  - `['example.tmpl', 'example.tmpl.jinja']`
* Follows-on from https://github.com/saltstack-formulas/systemd-formula/pull/22
 2019-02-25 13:49:08 +00:00
semantic-release-bot
0fabb21cc8 chore(release): 0.7.2 [skip ci] 
## [0.7.2](https://github.com/saltstack-formulas/template-formula/compare/v0.7.1...v0.7.2) (2019-02-24)

### Code Refactoring

* **tpldir:** use `tpldir` or derivatives to make formula portable ([52d03d8](https://github.com/saltstack-formulas/template-formula/commit/52d03d8)), closes [#22](https://github.com/saltstack-formulas/template-formula/issues/22)

### Continuous Integration

* **kitchen:** improve comments about `opensuse` problems encountered ([c246939](https://github.com/saltstack-formulas/template-formula/commit/c246939))
* **travis:** prevent `release` stage running for PRs ([3a072c7](https://github.com/saltstack-formulas/template-formula/commit/3a072c7)), closes [/travis-ci.com/saltstack-formulas/template-formula/jobs/180068519#L466](https://github.com//travis-ci.com/saltstack-formulas/template-formula/jobs/180068519/issues/L466) [/github.com/saltstack-formulas/template-formula/pull/42#issuecomment-466446324](https://github.com//github.com/saltstack-formulas/template-formula/pull/42/issues/issuecomment-466446324)
 2019-02-24 17:35:06 +00:00
Niels Abspoel
48b43d01a7
Merge pull request #46 from myii/PR_make-formula-portable 
refactor(tpldir): use `tpldir` or derivatives to make formula portable
 2019-02-24 12:10:13 +01:00
Imran Iqbal
52d03d895a refactor(tpldir): use tpldir or derivatives to make formula portable 
* Close #22.
 2019-02-24 05:30:02 +00:00
Imran Iqbal
ad9d44712d
Merge pull request #47 from saltstack-formulas/myii-patch-1 
ci(travis): prevent `release` stage running for PRs
 2019-02-24 05:25:08 +00:00
Imran Iqbal
3a072c7007
ci(travis): prevent release stage running for PRs 
* The `release` stage will always fail due to security reasons:
  - E.g. https://travis-ci.com/saltstack-formulas/template-formula/jobs/180068519#L466.
  - Discussed: https://github.com/saltstack-formulas/template-formula/pull/42#issuecomment-466446324.
* The `release` stage is unnecessary for PRs until the merge to `master`, in any case.
 2019-02-24 05:02:11 +00:00
Imran Iqbal
c246939666
ci(kitchen): improve comments about opensuse problems encountered 2019-02-24 01:49:52 +00:00
semantic-release-bot
12a3c7b91d chore(release): 0.7.1 [skip ci] 
## [0.7.1](https://github.com/saltstack-formulas/template-formula/compare/v0.7.0...v0.7.1) (2019-02-24)

### Continuous Integration

* **kitchen:** use `salt-minion` version of `opensuse` to ensure tests run ([99b073a](https://github.com/saltstack-formulas/template-formula/commit/99b073a))

### Documentation

* **changelog:** remove erroneous "closes" used by `semantic-release` ([be4571d](https://github.com/saltstack-formulas/template-formula/commit/be4571d))
 2019-02-24 01:44:26 +00:00
Imran Iqbal
be4571d352
docs(changelog): remove erroneous "closes" used by semantic-release 2019-02-24 01:31:55 +00:00
Niels Abspoel
d42f7b970b
Merge pull request #45 from myii/PR_use-deprecated-opensuse 
ci(kitchen): use `salt-minion` version of `opensuse` to ensure tests run
 2019-02-24 02:10:33 +01:00
Imran Iqbal
99b073a7ce ci(kitchen): use salt-minion version of opensuse to ensure tests run 
* The actual `opensuse/leap` image was passing but not running any
  of the `inspec` tests -- it links to version `15.x`
* `salt-minion` is `42.3`
 2019-02-24 01:08:17 +00:00
semantic-release-bot
6bf86d854d chore(release): 0.7.0 [skip ci] 
# [0.7.0](https://github.com/saltstack-formulas/template-formula/compare/v0.6.0...v0.7.0) (2019-02-23)

### Features

* **tofs:** implement backwards-compatible TOFSv2 for configurability ([068a94d](https://github.com/saltstack-formulas/template-formula/commit/068a94d)), closes [/freenode.logbot.info/saltstack-formulas/20190214#c1995273](https://github.com//freenode.logbot.info/saltstack-formulas/20190214/issues/c1995273) [/freenode.logbot.info/saltstack-formulas/20190214#c1995487](https://github.com//freenode.logbot.info/saltstack-formulas/20190214/issues/c1995487)
 2019-02-23 23:52:16 +00:00
Niels Abspoel
249d6a7ece
Merge pull request #28 from myii/PR_improve-TOFS 
Improve TOFS implementation for increased configurability
 2019-02-24 00:40:56 +01:00
Imran Iqbal
068a94d3a2 feat(tofs): implement backwards-compatible TOFSv2 for configurability 
* As discussed between comments:
  - https://freenode.logbot.info/saltstack-formulas/20190214#c1995273
  - https://freenode.logbot.info/saltstack-formulas/20190214#c1995487

* Squashed original PR with these commits present:
  - Improve TOFS implementation for increased configurability
  - Improve TOFS to allow custom files selection as well
  - Simplify `files_switch` macro to use only one loop
  - Make TOFS pattern fully-portable by using `tpldir`
  - Update `pillar.example` with current scheme for TOFS
  - Update `pillar.example` with the proposed scheme for TOFS
  - Fix bug where duplicate default lines are produced by the loop
  - feat(tofs): fix to work with old & new pillars and `tpldir` context

* Already tested and applied over existing TOFS in `systemd-formula`:
  - https://github.com/saltstack-formulas/systemd-formula/pull/17
 2019-02-23 23:27:14 +00:00
semantic-release-bot
69bc840e22 chore(release): 0.6.0 [skip ci] 
# [0.6.0](https://github.com/saltstack-formulas/template-formula/compare/v0.5.0...v0.6.0) (2019-02-23)

### Documentation

* **contributing:** add basic introductory text before the TOC ([45ccaf6](https://github.com/saltstack-formulas/template-formula/commit/45ccaf6))
* **contributing:** modify quoted heading to prevent TOC inclusion ([abcb6ef](https://github.com/saltstack-formulas/template-formula/commit/abcb6ef))
* **readme:** convert note into a heading ([5f2d789](https://github.com/saltstack-formulas/template-formula/commit/5f2d789))

### Features

* **toc:** use `markdown-toc` directly to update inline ([a5bae1e](https://github.com/saltstack-formulas/template-formula/commit/a5bae1e))
 2019-02-23 17:04:56 +00:00
Imran Iqbal
2c23866e1b
Merge pull request #43 from myii/PR_auto-md-toc 
feat(toc): use `markdown-toc` directly to update inline
 2019-02-23 16:52:06 +00:00
semantic-release-bot
c45ea67a0d chore(release): 0.5.0 [skip ci] 
# [0.5.0](https://github.com/saltstack-formulas/template-formula/compare/v0.4.0...v0.5.0) (2019-02-23)

### Features

* **kitchen+travis:** add `opensuse-leap` after resolving issues ([7614a3c](https://github.com/saltstack-formulas/template-formula/commit/7614a3c))
* **kitchen+travis:** conduct tests on a wider range of platforms ([1348078](https://github.com/saltstack-formulas/template-formula/commit/1348078))

### Tests

* **inspec:** update `supports` for all platforms added ([42f93b3](https://github.com/saltstack-formulas/template-formula/commit/42f93b3))
 2019-02-23 16:50:19 +00:00
Niels Abspoel
4bdfaae3ab
Merge pull request #38 from myii/PR_kitchen-travis-platforms 
feat(kitchen+travis): conduct tests on a wider range of platforms
 2019-02-23 16:53:13 +01:00
Imran Iqbal
abcb6ef399 docs(contributing): modify quoted heading to prevent TOC inclusion 2019-02-23 15:21:57 +00:00