valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #29945 from akissa/refactor-sqlcipher-config

Browse Source 
refactor sqlcipher config as keys under pillar
This commit is contained in:
Mike Place 2015-12-22 10:29:44 -07:00
commit e0e91f42da
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
salt/pillar/sqlcipher.py
View File

@ -23,29 +23,29 @@ Use the 'sqlcipher' key under ext_pillar for configuration of queries.
SQLCipher database connection configuration requires the following values
configured in the master config:
* ``pillar.sqlcipher.database`` - The SQLCipher database to connect to.
* ``sqlcipher.database`` - The SQLCipher database to connect to.
Defaults to ``'/var/lib/salt/pillar-sqlcipher.db'``.
* ``pillar.sqlcipher.pass`` - The SQLCipher database decryption password.
* ``pillar.sqlcipher.timeout`` - The connection timeout in seconds.
* ``sqlcipher.pass`` - The SQLCipher database decryption password.
* ``sqlcipher.timeout`` - The connection timeout in seconds.
Example configuration
.. code-block:: yaml
pillar.sqlcipher.database: /var/lib/salt/pillar-sqlcipher.db
pillar.sqlcipher.pass: strong_pass_phrase
pillar.sqlcipher.timeout: 5.0
sqlcipher:
database: /var/lib/salt/pillar-sqlcipher.db
pass: strong_pass_phrase
timeout: 5.0
Complete example
=================
.. code-block:: yaml
pillar:
sqlcipher:
database: '/var/lib/salt/pillar-sqlcipher.db'
pass: strong_pass_phrase
timeout: 5.0
sqlcipher:
database: '/var/lib/salt/pillar-sqlcipher.db'
pass: strong_pass_phrase
timeout: 5.0
ext_pillar:
- sqlcipher:
@ -99,12 +99,8 @@ class SQLCipherExtPillar(SqlBaseExtPillar):
'pass': 'strong_pass_phrase',
'timeout': 5.0}
_options = {}
_opts = __opts__.get('pillar', {}).get('sqlcipher', {})
if 'database' not in _opts:
_sqlcipher_opts = __opts__.get('pillar', {}).get('master', {})\
.get('pillar', {}).get('sqlcipher')
if _sqlcipher_opts is not None:
_opts = _sqlcipher_opts
_opts = __opts__.get('sqlcipher', {})
for attr in defaults:
if attr not in _opts:
log.debug('Using default for SQLCipher pillar %s', attr)