Skip to content

Commit

Permalink
Drop 'config' formula
Browse files Browse the repository at this point in the history
Reduce complexity a lot. See linked ticket for details.

Fixes QubesOS/qubes-issues#2048
  • Loading branch information
marmarek committed Jun 5, 2016
1 parent 693bcb2 commit d8ff5a6
Show file tree
Hide file tree
Showing 14 changed files with 1 addition and 1,231 deletions.
17 changes: 1 addition & 16 deletions FORMULA
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 3.2.0
release: 1
name: qubes-config-formula
top_level_dir: qubes
formula-files: qubes config _modules
formula-files: qubes
pillar-files: pillar
formula_dir: $(MGMT_DEFAULT_STATE_DIR)
pillar_dir: $(MGMT_DEFAULT_PILLAR_DIR)
Expand All @@ -15,28 +15,13 @@ os_family: RedHat, Debian, Suse, FreeBSD
summary: Qubes+Salt Management base configuration for SaltStack's Salt Infrastructure automation and management system
description: |
Qubes+Salt Management base configuration for SaltStack's Salt Infrastructure automation and management system
Qubes+Salt Management base configuration for SaltStack's Salt Infrastructure
automation and management system.
- Sets formula file_roots and updates salt configuration setting in
``/etc/salt/minion.s/f_defaults.conf`` based on pillar data located in
``/srv/pillar/base/config.sls``.
- Ensures salt-minion service is dead
state-tops:
base:
enable:
- config
- qubes.directories
- qubes.user-dirs

pillar-tops:
base:
enable:
- config
- config.modules

conf:
config:
formula_dirs:
Expand Down
40 changes: 0 additions & 40 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ Available States
.. contents::
:local:

``config``
----------

- Sets formula file_roots and updates salt configuration setting in
``/etc/salt/minion.s/f_defaults.conf`` based on pillar data located in
``/srv/pillar/base/config.sls``.

- Ensures salt-minion service is dead

``qubes.directories``
---------------------

Expand Down Expand Up @@ -51,39 +42,8 @@ being enforced.
Included Pillar Data
====================

``config``
----------

Contains all salt configuration data user to configure the salt.

``qubes``
---------

Contains all the qubes default setting for various states


``Configuration``
=================
Every option available in the templates can be set in pillar. Settings under
'salt' will be overridden by more specific settings under ``salt['master']``,
``salt['minion']`` or ``salt['cloud']``

::

salt:
ret_port: 4506
master:
user: saltuser
...
minion:
user: saltuser
...
cloud:
providers: ec2
...

``Extending``
=============
Additional templates can be added by the user under salt/files/minion.d and
master.d. This might be useful if, for example, a recently-added configuration
option is not yet provided by the default template.
111 changes: 0 additions & 111 deletions _modules/ext_config.py

This file was deleted.

21 changes: 0 additions & 21 deletions config/defaults.yaml

This file was deleted.

Loading

0 comments on commit d8ff5a6

Please sign in to comment.