Salt/salt-formula
0
0 Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-10-09 03:08:10 +02:00
Code Issues Activity

Merge pull request #51 from andrew-vant/salt.d

Browse Source 
Added recursive management of minion.d and master.d.
This commit is contained in:
Forrest committed 2014-10-06 09:15:53 -07:00
2 parents 095c6a8e4b 00e245e20a
commit 05087a8d42
4 files changed
+8 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

salt/files/master → salt/files/master.d/_defaults.conf
View File
File renamed without changes.
salt/files/minion → salt/files/minion.d/_defaults.conf
View File
File renamed without changes.
salt/master.sls
+4 -3
View File
@@ -3,10 +3,11 @@
salt-master: salt-master:
pkg.installed: pkg.installed:
- name: {{ pkgs['salt-master'] }} - name: {{ pkgs['salt-master'] }}
file.managed: file.recurse:
- name: /etc/salt/master.d/master.conf - name: /etc/salt/master.d
- template: jinja - template: jinja
- source: salt://salt/files/master - source: salt://salt/files/master.d
- clean: True
service.running: service.running:
- enable: True - enable: True
- watch: - watch:
salt/minion.sls
+4 -3
View File
@@ -3,10 +3,11 @@
salt-minion: salt-minion:
pkg.installed: pkg.installed:
- name: {{ pkgs['salt-minion'] }} - name: {{ pkgs['salt-minion'] }}
file.managed: file.recurse:
- name: /etc/salt/minion.d/minion.conf - name: /etc/salt/minion.d
- template: jinja - template: jinja
- source: salt://salt/files/minion - source: salt://salt/files/minion.d
- clean: True
service.running: service.running:
- enable: True - enable: True
- watch: - watch: