Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity
893 Commits 3 Branches 68 Tags 2.4 MiB
Commit Graph

458 Commits

Author SHA1 Message Date
Dafydd Jones a89fb3f4aa fix: revert to using `is mapping` in Jinja2 
* CVE-2021-25283 enables Jinja2 safe mode, which breaks use of
  `'dict' in x.__class__.__name__` workaround
* Workaround no longer needed as CentOS 6 is EOL
 2021-03-02 00:40:07 +00:00
Imran Iqbal d5320a35ed
fix(pkgrepo/suse/install): avoid managing repo if it already exists 
Use ugly `zypper lr --uri` hack to get around failure if the `base_url`
already exists under a different name:

```
      ID: salt-pkgrepo-install-saltstack-suse
Function: pkgrepo.managed
    Name: systemsmanagement_saltstack_products
  Result: False
 Comment: Failed to configure repo 'systemsmanagement_saltstack_products':
          Repository 'systemsmanagement_saltstack_products' already exists as 'systemsmanagement_saltstack'.
 Started: 09:28:39.154054
Duration: 2760.727 ms
```

Upstream code:

* 45cc49daed/salt/modules/zypperpkg.py (L1262-L1265)
 2021-01-29 11:23:00 +00:00
Imran Iqbal 48f8da0357
fix(osfamilymap): update openSUSE `pkgrepo` URLs 2021-01-29 11:22:59 +00:00
Imran Iqbal d2404d5175
test(map): verify `map.jinja` dump using `_mapdata` state 
* Semi-automated using https://github.com/myii/ssf-formula/pull/285
 2020-12-23 18:21:53 +00:00
Mark Ferrell b1d296d270 feat: enable the metadata grains server by default 2020-09-20 07:47:53 -07:00
noelmcloughlin e313401cd6 fix(jinja): stop repeating user/group args 2020-09-11 23:27:30 +01:00
noelmcloughlin d61e671fa0 fix(windows): group arg not supported on windows 2020-09-11 23:00:33 +01:00
noelmcloughlin 887d1559b5 fix(windows): group name is users not root 2020-09-11 22:12:07 +01:00
noelmcloughlin 0c591bba95 fix(windows): git.latest(parallel:true) does not work 2020-09-11 22:03:25 +01:00
noelmcloughlin a36f2eb2d2 fix(windows): dont run master state 2020-09-11 20:53:00 +01:00
RemiChristiaan d71cf0c4f9 fix(service): service salt-master and salt-minion to restart last 
When running a high-state on the salt-master to deploy itself, the run fails
with an Authentication error occurred because the master restarts half way though.
 2020-07-27 15:11:37 +02:00
Imran Iqbal 76e820c36f style(libtofs.jinja): use Black-inspired Jinja formatting [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/237
 2020-07-19 23:28:36 +01:00
sticky-note e1774e3b40 fix(service): svc `salt-master` watch `remove-default-master-conf-file` 2020-07-16 13:21:09 +11:00
N a46645607b fix(minion): fix requisites from recent prs 2020-07-15 14:24:56 +01:00
N e596cf671f
Merge branch 'master' into macos 2020-07-15 11:42:03 +01:00
sticky-note b6ab1b1d54 fix(freebsd): command `at` is already present in base system 2020-07-01 13:45:27 +11:00
Dafydd Jones 62f6d39d63 fix(windows): `py2` should still be default like other platforms 
* add `-` if someone supplies `py3` in pillar, like other platforms
 2020-06-26 17:03:40 +01:00
N c72b183f5f fix(macos): use macos service names 
X
 2020-06-13 21:47:45 +01:00
N 6d6e2b9fd4 Merge branch 'macos' of https://github.com/noelmcloughlin/salt-formula into macos 2020-06-13 21:16:36 +01:00
N f389b19a49 chore(hashsum): add values for master/minion files 2020-06-13 21:11:58 +01:00
N 8875b93eb7 chore(pr): adopt pr comments; indent jinja 2020-06-13 21:11:28 +01:00
N 419352f6ce Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula into macos 2020-06-13 20:33:36 +01:00
N 3920ed3bd4
Merge branch 'master' into macos 2020-06-01 01:15:32 +01:00
N 4d901b94d1 Merge branch 'master' into macos 2020-06-01 01:08:54 +01:00
Imran Iqbal 5d9a92bf1d
fix(opensuse): use appropriate upstream repo 2020-05-26 03:46:55 +01:00
Imran Iqbal ed20b2662f
Merge pull request #458 from hatifnatt/feat-apt-pinning 
feat(package): use apt-pinning to pin specific package version
 2020-04-18 12:17:11 +01:00
Heinz Wiesinger 02fbcd43fc
fix(api): remove spurious colon in salt.api state 2020-04-03 10:07:46 +01:00
Imran Iqbal 0da366c7b2
refactor(osfamilymap): remove workaround for OpenSUSE 15.1 2020-03-21 00:22:22 +00:00
Imran Iqbal 7551ba5b0e
Merge pull request #460 from noelmcloughlin/version_cmp 
fix(jinja): replace version_cmp with grains lookup
 2020-03-19 13:23:59 +00:00
N dd37869d28
fix(jinja): replace version_cmp with grains lookup 2020-03-19 13:16:00 +00:00
N 325f6c061b
fix(jinja): replace version_cmp with grains lookup 2020-03-19 12:45:35 +00:00
hatifnatt 98ad87a001 feat(package): use apt-pinning to pin specific package version 
Available only on Debian family OS-es
 2020-03-18 22:49:28 +03:00
Imran Iqbal 10e8778647
Merge pull request #453 from cr1st1p/allow-disable-services 
Allow disabling services or just ignoring them.
 2020-03-11 07:10:33 +00:00
cristi 29ffd68d34 feat(mapping): better control of the service's state 
Instead of the default service.running + enabled, you can control
the actual state, via pillar.
And you can even say 'state = ignore' and no state will be generated
to control the service
 2020-02-20 18:44:04 +02:00
N fbaa456ca6
feat(metastate): add metastate per community convention 2020-02-18 13:34:38 +00:00
Imran Iqbal 4955737f84 fix(libtofs): “files_switch” mess up the variable exported by “map.jinja” [skip ci] 
* Checked using https://github.com/myii/ssf-formula/pull/131
 2020-02-14 19:11:08 +00:00
sticky-note bbcc4cda7a fix(tpl_path): replace slspath to tplroot 2020-02-13 09:43:25 +11:00
N 7fdbb84b4f
Merge pull request #449 from noelmcloughlin/hardcoding2 
feat(mapping): simplify py version handling, less jinja
 2020-01-26 00:41:05 +01:00
N 715e3b8fa4
refactor(mapping): simplify py version handling 2020-01-25 18:06:29 +00:00
N efc5d7c632
Merge branch 'master' into macos 2020-01-25 19:02:42 +01:00
N 698d6ae3af
chore(cleanup): delete unused directory 2020-01-24 00:56:52 +00:00
N e5317d8c30
Merge branch 'master' into macos 2020-01-22 16:57:15 +01:00
N 94027f7332
feat(macos): basic launchctl service support 2020-01-22 15:55:42 +00:00
nb eda88bd1a6 feat(formulas): git.latest parallelization 2019-12-18 11:30:37 +11:00
nb 9362277f2a feat(per-formula-opts): configure git.latest state per formula 2019-12-04 09:48:35 +11:00
Imran Iqbal ef4ad1ec5c
fix(syndic.sls): fix `salt-lint` errors 
```bash
Examining salt/syndic.sls of type state
[201] Trailing whitespace
salt/syndic.sls:12
  {%- endif %}
```
 2019-10-09 18:34:13 +01:00
Imran Iqbal 3e6397788f
fix(minion.sls): fix `salt-lint` errors 
```bash
Examining salt/minion.sls of type state
[210] Numbers that start with `0` should always be encapsulated in quotation marks
salt/minion.sls:20
    - mode: 0644
```
 2019-10-09 18:34:12 +01:00
Imran Iqbal 5b348eb354
fix(map.jinja): fix `salt-lint` errors 
```bash
Examining salt/map.jinja of type state
[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:4
{## Start imports ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:21
{## Merge in salt pillar ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:24
{## Merge in salt_formulas pillar ##}
```
 2019-10-09 18:34:12 +01:00
N 356035d8f8
Merge pull request #437 from sticky-note/fix/symlinks 
fix(symlinks): replace symlinks with real files
 2019-09-21 00:22:40 +02:00
sticky-note c4d013260f fix(symlinks): replace symlinks with real files 2019-09-20 11:02:21 +11:00