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
746 commits 4 branches 131 tags 1.6 MiB
Commit graph

746 commits

This branch
This branch
All branches
Author SHA1 Message Date
Imran Iqbal
b5c4987ac3 Improve comments and examples in osfamilymap & osmap 2019-02-12 11:57:41 +00:00
Imran Iqbal
d7940c0998 Fix map.jinja and add more OSes 2019-02-12 07:36:59 +00:00
Javier Bértoli
92f0b8c636
Merge pull request #20 from aboe76/update_map.jinja 
update formula with map.jinja and style guide references, improve REA…
 2019-02-10 19:37:54 -03:00
Niels Abspoel
b23c0c2fea update 2019-02-10 22:50:33 +01:00
Niels Abspoel
775a9309e7 update formula with map.jinja and style guide references, improve README and VERSION 2019-02-10 22:47:43 +01:00
Niels Abspoel
95e5e37934
Merge pull request #19 from eole/feature/Template-Override-and-Files-Switch 
Feature/template override and files switch
 2019-02-09 00:18:48 +01:00
Daniel Dehennin
312fcdb62e Examples must be consistent 
The “template” is kept during rendering.

* TOFS_pattern.md: add “template” to rendered state.

* template/macros.jinja: ditoo.
 2019-02-07 17:47:09 +01:00
Daniel Dehennin
8bd215741d Remove double slash in generated salt URL 
When the files are “full path” with leading slash “/”, the generated
URL contain a double slash because of the join.

* template/macros.jinja: remove leading slash before joining parts.

* TOFS_pattern.md: mirror changes of “macros.jinja”.
 2019-02-07 16:08:15 +01:00
Daniel Dehennin
24eaeb7ca4 Add an example for “ntp” of the use of “files_switch” 2019-02-07 16:03:30 +01:00
Daniel Dehennin
e4e7067573 Accept pillar separator in “files_switch” prefix 
The prefix was used for 2 purposes:

- define the pillar prefix where to lookup “:files_switch”. It
  supports the colon “:” separator to lookup in pillar subtree like
  “foo:bar”
- define the path prefix where to look for “files/”, It did not support
  separator to lookup inside directory tree.

This patch only replace any colon “:” with “/” when looking up
“files/” directory, with the “foo:bar” prefix:

- lookup “foo:bar:files_switch” pillar to get list of grains to match
- lookup files under “salt://foo/bar/files/”

* TOFS_pattern.md: document the new use of “prefix” supporting colon “:”.

* template/macros.jinja: transform any colon “:” in “prefix” by slash
  “/” to lookup files.
 2019-02-07 16:01:17 +01:00
Daniel Dehennin
6c1797433c Make TOFS pattern example usable 
The example could not be used as-is. This commit improve conformity to
formula conventions.

* TOFS_pattern.md: add missing commas “,” in “map.jinja” and extra one
  to ease the addition of new entries.
  Import “map.jinja” in “init.sls” and “conf.sls”.
  Declare descriptive state IDs.
  Use the “module.function” notation.
  Use the “name” parameter.
 2019-02-07 15:56:45 +01:00
Daniel Dehennin
8bbab148ad Cosmetics modification of TOFS pattern documentation 
* TOFS_pattern.md: add myself as modifier.
  Trim trailing whitespaces.
  Separate titles from first paragraph.
 2019-02-07 15:52:15 +01:00
Daniel Dehennin
784ce722ad Switch template.config to TOFS pattern 2019-02-06 16:12:02 +01:00
Daniel Dehennin
2dd659f20d Import TOFS pattern from Zabbix formula 2019-02-06 16:09:37 +01:00
Niels Abspoel
71e7400517
Merge pull request #17 from k-hamza/formula_versioning 
Add VERSION file
 2018-12-11 20:13:21 +01:00
Karim Hamza
0c37ef46e6 Add VERSION file 2018-12-11 10:31:24 +01:00
Niels Abspoel
ae6864c18a
Merge pull request #16 from k-hamza/formula_versioning 
Note about formula versioning
 2018-12-10 20:07:34 +01:00
Karim Hamza
9b3544f725 Add note about formula versioning 2018-12-10 15:44:49 +01:00
Javier Bértoli
5238913d6c
Merge pull request #14 from vutny/fix-note-block 
Align with SaltStack official formulas doc page
 2018-03-05 07:47:05 -03:00
Denys Havrysh
dce5cf2a88
Align with SaltStack official formulas doc page 2018-03-02 14:36:24 +02:00
Javier Bértoli
5df9b11e34
Merge pull request #13 from vutny/fix-https-link 
Use https in the link to SaltStack documentation
 2018-02-21 11:08:06 -03:00
Denys Havrysh
2c74c78a35
Use https in the link to SaltStack documentation 2018-01-18 14:36:29 +02:00
Niels Abspoel
9e06a9817c Merge pull request #11 from marco-m/patch-1 
map.ninja: fix typos and leftover comments
 2017-07-19 10:56:12 +02:00
Marco Molteni
691c6bd888 map.ninja: fix typos and leftover comments 2017-07-18 22:16:20 +02:00
puneet kandhari
4a29a149b4 Merge pull request #8 from andygabby/master 
Remove whitespace in map.jinja comment
 2015-10-29 04:44:15 -05:00
Andrew Gabbitas
0fd4843b4c Remove whitespace in map.jinja comment 2015-10-29 02:40:42 -06:00
Forrest
9098e94f10 Merge pull request #7 from aboe76/master 
Improve style and jinja too match salt-formula
 2015-06-01 10:51:23 -07:00
Niels Abspoel
c195be9bec Improve style and jinja too match salt-formula 2015-06-01 19:47:35 +02:00
Wolodja Wentland
22013c25d7 Merge pull request #6 from puneetk/master 
Propose new-ish formula style
 2015-05-26 13:47:31 +01:00
puneet kandhari
17cb813e9e Propose new-ish formula style 
- defaults live in defaults.yml
- map jinja overrides by grain + merges pillar:lookup
- split all contextually similar states in their own files
 2015-05-26 07:41:19 -05:00
Nitin Madhok
d001ec7a8e Merge pull request #5 from saltstack-formulas/style-short-dec 
Change states to use short-dec style
 2014-12-13 06:57:23 -05:00
Seth House
2ac4e9567e Change states to use short-dec style 2014-12-13 00:20:00 -07:00
Nitin Madhok
e94754f0ca Update CHANGELOG.rst 2014-07-29 12:57:08 -04:00
Nitin Madhok
b3e1862d70 Update README.rst 
Fix broken link
 2014-07-28 19:47:23 -04:00
Forrest
f4651d2037 Fixing pillar to match the map file. 
Map file and pillar didn't match.
 2014-03-11 08:50:55 -07:00
Steffen Roegner
0c8832f232 Merge pull request #3 from gravyboat/master 
Updated the license and readme to match our standards.
 2014-03-03 13:30:21 -05:00
Forrest
e3c15ab197 Merge pull request #4 from Jokipii/master 
Add change log
 2014-02-26 22:31:00 -07:00
Antti Jokipii
5e5abe9d40 Add change log 2014-02-26 01:45:11 +02:00
Forrest Alvarez
a53e48a103 Updated the license and readme to match our standards. 2014-02-19 05:46:08 +00:00
Forrest
9bd10044b8 Merge pull request #2 from evvers/master 
Add map.jinja
 2014-02-16 15:54:34 -07:00
Eugene Vereschagin
5c180091b9 Use map.jinja content in init.sls 2014-02-16 22:19:28 +00:00
Eugene Vereschagin
b1dbff0957 Add map.jinja 2014-02-16 22:12:40 +00:00
Forrest
c0fec431a3 Merge pull request #1 from evvers/master 
Update README.rst
 2014-02-16 14:51:44 -07:00
Eugene Vereschagin
112b6a4008 Add link to Salt Formula documentation 2014-02-16 21:46:03 +00:00
Eugene Vereschagin
a3be15cff2 Change extension from .md to .rst 2014-02-16 21:43:18 +00:00
Lukas Erlacher
528d4166bd Initial commit 2013-11-03 19:50:58 +01:00