Commit Graph

44 Commits

Author SHA1 Message Date
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
Heinz Wiesinger 184f338741 fix(master): don't manage config for saltstack enterprise master plugin 2021-10-27 17:42:46 +02: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
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 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
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
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 c72b183f5f fix(macos): use macos service names
X
2020-06-13 21:47:45 +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 4d901b94d1 Merge branch 'master' into macos 2020-06-01 01:08:54 +01: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
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
sticky-note bbcc4cda7a fix(tpl_path): replace slspath to tplroot 2020-02-13 09:43:25 +11:00
N 94027f7332
feat(macos): basic launchctl service support 2020-01-22 15:55:42 +00:00
Imran Iqbal 1b202afb29
feat(`tofs`): allow TOFS for master configuration 2019-06-07 03:58:24 +01:00
Javier Bértoli 2e1d4c4573 Specify dependencies 2019-03-31 13:02:13 -03:00
Iustina 6027df00a4 Add configuration for packages version 2018-02-01 18:31:35 +02:00
Rene Jochum f17b8f5424 Add optional method to remove /etc/salt/master.
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-15 15:13:21 +02:00
Matthew X. Economou 001b034eb5 Replace absolute config pathname prefixes with the config_path variable 2016-03-29 13:28:47 -04:00
Niels Abspoel 6ec31374cb Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02:00
Brian Jackson 7649c26a0d Switch config file.recurse to clean by default and tell it to ignore _*
Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf

We don't want to stomp all over Salt's files, but we do want a pristine
starting point to lay down our managed config. So we use clean: True on the
file.recurse call, but we tell it to ignore files that start with an _

We have to rename the current config file (_defaults.conf) because it will be
ignored by the rule that ignores Salt's _* config files.

This also means we need to clean up old config files (_defaults.conf) and
restart the service if we cleaned it up.
2015-03-27 17:58:05 -05:00
Brian Jackson 924c04c0d8 Add setting to not install packages
If you are installing Salt via git/pip, the formula will try to overwrite your
install with packaged versions. This setting makes it possible to avoid that.
2015-03-24 12:08:08 -05:00
Brian Jackson 8ebb7f57df Stop using clean: True on /etc/salt/{minion,master}.d
New versions of Salt put config files in /etc/salt/{minion,master}.d. We don't
want to erase them by using a clean: True on the file.recurse. This is a
backward incompatible change, but it's necessary to avoid deleting Salt config
files.

Resolves #104
2015-03-24 10:46:25 -05:00
Brian Jackson cb3aa80c62 Don't overwrite salt variable
Using a variable named salt is a bad idea when salt already has a variable
named salt.
2015-03-16 23:39:32 -05:00
Simon Lloyd cb03e885d4 Fix: pkgs is undefined
Update sls files to match name change in map.jinja.
2015-01-11 19:31:05 +01:00
Niels Abspoel 896578a75a Removed package_map lookup
Added map.jinja solution more in line with other formulas,
This also improves issue #30

and pull request #30
2014-12-31 11:52:31 +01:00
Seth House 1682df8592 Merge remote-tracking branch 'origin/pr/47'
Conflicts:
	salt/master.sls
	salt/minion.sls
2014-10-09 16:39:07 -06:00
Andrew Vant 00e245e20a Added recursive management of minion.d and master.d.
This allows users to easily add configuration settings that the formula
doesn't yet provide, without having to modify the existing templates.
2014-10-06 11:56:07 -04:00
Kevin Bowling 4675d68bd8 Initial FreeBSD support 2014-10-02 00:20:29 -07:00
Johannes 247e6403a7 Add missing .conf to config files
Closes #45
2014-10-01 18:37:09 +01:00
Love Nyberg 75a1f888eb #12 Moved master and minion config file to .d 2014-09-08 21:38:30 +02:00
Kenneth Wilke a6667cdb81 Isolated package mapping and some fixes
Moved package_table to it's own file, imported by sls files
Moved minion package under watch
Fixed some template mistakes I made
2013-08-14 14:53:29 -05:00
Kenneth Wilke 3634e3d833 removed bad require line 2013-08-12 17:36:36 -05:00
Kenneth Wilke b9d2e2f9d4 changed salt-master package to salt-master 2013-08-12 17:33:28 -05:00
Kenneth Wilke 76684f638d changed master require to watch, and both to salt-master 2013-08-12 17:33:02 -05:00
Kenneth Wilke d0df360e5d Removed template refs, quoted log_datefmt_logfile 2013-08-12 16:45:39 -05:00
Thomas S Hatch fa29decc39 Move into salt subdir 2013-07-27 09:30:56 -06:00
Colton Myers 46652ebfda Move everything to root directory for submodule use, Fix #4 2013-07-17 09:35:39 -06:00
Ari Lerner 91330d170d Added small readme 2013-06-18 00:18:10 -07:00
Thomas S Hatch 349a077675 Start on salt formula 2013-06-12 17:53:26 -06:00