2
0
Commit Graph

491 Commits

Author SHA1 Message Date
vveliev
b836fe4edd
Merge branch 'saltstack-formulas:master' into master 2022-08-28 23:01:17 -04:00
Eric Cook
2881fdd811 feat(freebsd): update package names for Python 3.9
% print $OSTYPE;pkg search 'py39-(pygit2|gitpython|dulwich|salt)'
freebsd13.0
py39-dulwich-0.19.16           Python implementation of the Git file formats and protocols
py39-gitpython-3.1.27          Python Git Library
py39-pygit2-1.8.0              Python bindings for libgit2
py39-salt-3004.2               Distributed remote execution and configuration management system
2022-07-20 11:18:52 -04:00
vveliev
a5076fb42a feat(osfingermap): adding debian 11 gitfs confgs 2022-06-21 15:13:57 -04:00
Imran Iqbal
c05fddf139
feat(macos): use saltstack as package to install 2022-05-17 09:03:28 +01:00
Imran Iqbal
b2316ed17b
fix(minion): replace literals with rootuser & rootgroup from map 2022-05-17 09:03:27 +01:00
Imran Iqbal
3eff2d2acf
refactor(minion): use pkg.installed state for macOS
Keep consistent with `salt/master.sls`.
2022-05-17 09:02:19 +01:00
Niels Abspoel
0e4b3bdf94
fix(pkgrepo): pkgrepo use cmd.shell 2022-04-13 22:52:43 +02:00
Imran Iqbal
d00c069e25
fix(gentoo): use retry_options to avoid spurious service failures
Use the `retry_options` on Gentoo, similar to how its already being used
across the state files for FreeBSD, since we're getting failures such as
this one:

* https://gitlab.com/myii/salt-formula/-/jobs/2285180374
2022-04-03 10:27:56 +01:00
Imran Iqbal
02c31df0c5
fix(minion): respect minion_remove_config: true
Fixes #527.
2022-02-03 16:14:40 +00:00
N
89f3653de9
Merge pull request #517 from ze42/log_fmt_console
fix(log_fmt_console): double option in config
2021-12-27 17:54:52 +00:00
Heinz Wiesinger
c9c6e12223 fix(minion): fix windows path construction 2021-12-27 14:41:18 +01:00
Heinz Wiesinger
dfa7f7d1d8 feat(minion): ensure correct permissions for salt-cloud generated files 2021-12-27 14:41:13 +01:00
Javier Bértoli
7540dc90aa fix(minion): update config parameter saltenv
`environment` is being deprecated, renamed to `saltenv`
2021-12-14 11:12:37 -03:00
Niels Abspoel
7d26191578
Merge pull request #518 from ze42/sorted_extra_options
fix: sort extra options in configuration
2021-12-04 21:17:19 +01:00
Robert Fairburn
5b7d7ea70e
fix(master): master.d template to support saltclass ext_pillar 2021-11-30 23:15:21 +00:00
hk
a932a8cc84 fix: update to modern defaults for Debian family
Don't add key_url as it is deprecated and not needed when
pkgrepo_keyring is set. This has been supported since stretch so make it
the default. Also use py3 repo by default for Debian family as it is now
the only option.

Additionally, Raspbian has been updated to use signed-by by default.
2021-11-05 10:08:00 +01:00
hk
97e1d1f07a fix: make it possible to not have key_url set
Fixes #520
2021-11-05 09:21:06 +01:00
Adrien "ze" Urban
89cdcec595 fix: sort extra options in configuration
Ensure extra options in generated configuration is sorted, to ensure stable
configuration.
2021-10-28 11:54:09 +02:00
Adrien "ze" Urban
b705e44378 fix(log_fmt_console): double option in config
When option was specified, it appeared twice in config, making configuration
file buggy, and not loaded.
2021-10-28 11:41:18 +02:00
Heinz Wiesinger
184f338741 fix(master): don't manage config for saltstack enterprise master plugin 2021-10-27 17:42:46 +02:00
Javier Bértoli
47ab261b39 fix(debian,ubuntu): rename repo file to match documentation
Also:

* add keyring file for the salt repo, due to `apt-key` deprecation
* remove old repository file
2021-09-17 15:50:54 -03:00
Dallas Harris
ca1df1b69e
fix(default): set salt:minion:master_type to str
Having it set as true causes an error with the minion config when the salt-minion starts
2021-09-04 21:27:43 +01:00
Imran Iqbal
0ab42d7ce8
feat(freebsd): update packages from py37-* => py38-* 2021-07-14 14:42:28 +01:00
Imran Iqbal
5146c449d5
fix(oracle-7): use osmajorrelease instead of $releasever
Avoid this error:

```
      ID: salt-master
Function: pkg.installed
  Result: False
 Comment: Error occurred installing package(s). Additional info follows:

   errors:
       - Running scope as unit run-402.scope.
         Loaded plugins: ovl, ulninfo
         https://repo.saltproject.io/py3/redhat/7Server/x86_64/3002/repodata/repomd.xml:
             [Errno 14] HTTPS Error 404 - Not Found
         Trying other mirror.
         No package salt-master available.
         Error: Nothing to do
```
2021-05-25 21:03:37 +01:00
Imran Iqbal
80542bad6e
fix(repo): update repo urls to repo.saltproject.io
Use the following command:

```
$ GREP_SED="\(repo\.salt\)stack\.com" \
  && grep -rl --exclude-dir=.git "${GREP_SED}" \
  | grep -v .un~$ \
  | xargs sed -i -e "/${GREP_SED}/s//\1project.io/g"
```
2021-05-25 19:27:15 +01:00
Imran Iqbal
698b7eae59
fix(freebsd): use retry_options to avoid spurious service failures
Use the `retry_options` already being used for the Salt minion service,
since we're getting failures such as this one:

* https://github.com/myii/salt-formula/runs/2415072504

This is made worse by the fact that GitHub Actions cannot re-run a
single job (at the current time).
2021-04-23 09:14:10 +01:00
Raphaël Hertzog
97299983ba
Ensure consistent ordering of module_config entries
Right now when you set module_config entries in your pillar data
like this:
salt:
  minion:
    module_config:
      smtp.from: 'Kali Salt <admins+salt@kali.org>'
      smtp.to: 'Kali Admins <admins+salt@kali.org>'
      smtp.host: localhost
      smtp.subject: 'Results of salt actions on'
      smtp.fields: id,fun

On each run, you will always a different ordering of the various
fields in the minion configuration file, leading to spurious restart
of the minion and admin annoyance:

          ID: salt-minion
    Function: file.recurse
        Name: /etc/salt/minion.d
      Result: True
     Comment: Recursively updated /etc/salt/minion.d
     Started: 13:39:25.689775
    Duration: 874.318 ms
     Changes:
              ----------
              /etc/salt/minion.d/f_defaults.conf:
                  ----------
                  diff:
                      ---
                      +++
                      @@ -930,10 +930,10 @@
                       # A dict for the test module:
                       #test.baz: {spam: sausage, cheese: bread}
                       #
                      +smtp.fields: id,fun
                      +smtp.from: Kali Salt <admins+salt@kali.org>
                       smtp.to: Kali Admins <admins+salt@kali.org>
                      -smtp.fields: id,fun
                       smtp.host: localhost
                      -smtp.from: Kali Salt <admins+salt@kali.org>
                       smtp.subject: Results of salt actions on

With the change here, this bad behaviour is gone...
2021-04-09 16:02:36 +02:00
Imran Iqbal
a30f124485
fix(freebsd): fix package names [skip ci]
Resolves issues introduced in 24ebbb4e0c.
2021-04-04 15:41:53 +01:00
Imran Iqbal
61201de8c6
fix(openbsd): update to provide support for most recent versions 2021-03-30 12:40:41 +01:00
Imran Iqbal
24ebbb4e0c
fix(freebsd): update to provide support for most recent versions 2021-03-30 12:40:41 +01:00
Imran Iqbal
bbd7286240
refactor(retry_options): provide options from defaults/pillar 2021-03-30 12:40:40 +01:00
Imran Iqbal
69d598138e
fix(osfamilymap): use whoami for Windows rootuser
Fix #495
2021-03-30 12:02:12 +01:00
Mark Ferrell
8742ab30bb
feat: allow selecting alternate salt package repositories
Make the upstream salt package repository selectable, thus allowing the
use of archived salt versions (hosted in
https://archive.repo.saltproject.io), as well as custom salt versions
hosted in alternate repositories.
2021-03-03 20:46:56 +00:00
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