saltstack-formulas/mysql-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/mysql-formula.git synced 2025-04-17 10:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(yamllint): include for this repo and apply rules throughout

Browse source 
* Semi-automated using `ssf-formula` (v0.5.0)
* Fix (or ignore) errors shown below:

```bash
mysql-formula$ $(grep "\- yamllint" .travis.yml | sed -e "s:^\s\+-\s\(.*\):\1:")
./mysql/osfamilymap.yaml
  4:1       warning  missing document start "---"  (document-start)
  5:6       error    syntax error: found character '%' that cannot start any token
  94:17     error    trailing spaces  (trailing-spaces)
  191:89    error    line too long (90 > 88 characters)  (line-length)

./mysql/defaults.yaml
  3:1       warning  missing document start "---"  (document-start)
  7:4       error    syntax error: found character '%' that cannot start any token
  44:89     error    line too long (93 > 88 characters)  (line-length)
  51:89     error    line too long (111 > 88 characters)  (line-length)
  58:89     error    line too long (104 > 88 characters)  (line-length)
  65:89     error    line too long (103 > 88 characters)  (line-length)
  71:89     error    line too long (95 > 88 characters)  (line-length)
  77:89     error    line too long (102 > 88 characters)  (line-length)
  83:89     error    line too long (101 > 88 characters)  (line-length)
  86:89     error    line too long (95 > 88 characters)  (line-length)
  90:89     error    line too long (95 > 88 characters)  (line-length)

./mysql/supported_sections.yaml
  2:2       error    syntax error: found character '%' that cannot start any token

./mysql/osmap.yaml
  4:4       error    syntax error: found character '%' that cannot start any token
  7:89      error    line too long (96 > 88 characters)  (line-length)
  8:89      error    line too long (97 > 88 characters)  (line-length)

pillar.example
  1:1       warning  missing document start "---"  (document-start)
  36:8      error    wrong indentation: expected 8 but found 7  (indentation)
  77:16     warning  truthy value should be one of [false, true]  (truthy)
  80:13     warning  truthy value should be one of [false, true]  (truthy)
  83:13     warning  truthy value should be one of [false, true]  (truthy)
  85:13     warning  truthy value should be one of [false, true]  (truthy)
  89:13     warning  truthy value should be one of [false, true]  (truthy)
  96:13     warning  truthy value should be one of [false, true]  (truthy)
  112:19    warning  truthy value should be one of [false, true]  (truthy)
  117:17    warning  too few spaces before comment  (comments)
  118:12    warning  truthy value should be one of [false, true]  (truthy)
  119:17    warning  truthy value should be one of [false, true]  (truthy)
  130:25    warning  truthy value should be one of [false, true]  (truthy)
  131:19    warning  truthy value should be one of [false, true]  (truthy)
  153:16    warning  truthy value should be one of [false, true]  (truthy)
  166:14    warning  truthy value should be one of [false, true]  (truthy)
  171:18    warning  truthy value should be one of [false, true]  (truthy)
  172:89    error    line too long (93 > 88 characters)  (line-length)
  175:18    warning  truthy value should be one of [false, true]  (truthy)
  176:89    error    line too long (111 > 88 characters)  (line-length)
  179:18    warning  truthy value should be one of [false, true]  (truthy)
  179:26    warning  missing starting space in comment  (comments)
  180:89    error    line too long (104 > 88 characters)  (line-length)
  183:18    warning  truthy value should be one of [false, true]  (truthy)
  183:26    warning  missing starting space in comment  (comments)
  184:89    error    line too long (103 > 88 characters)  (line-length)
  187:18    warning  truthy value should be one of [false, true]  (truthy)
  187:26    warning  missing starting space in comment  (comments)
  188:89    error    line too long (95 > 88 characters)  (line-length)
  191:18    warning  truthy value should be one of [false, true]  (truthy)
  191:26    warning  missing starting space in comment  (comments)
  192:89    error    line too long (102 > 88 characters)  (line-length)
  195:18    warning  truthy value should be one of [false, true]  (truthy)
  195:26    warning  missing starting space in comment  (comments)
  196:89    error    line too long (101 > 88 characters)  (line-length)
  199:18    warning  truthy value should be one of [false, true]  (truthy)
  199:26    warning  missing starting space in comment  (comments)
  200:89    error    line too long (95 > 88 characters)  (line-length)
  203:18    warning  truthy value should be one of [false, true]  (truthy)
  203:26    warning  missing starting space in comment  (comments)
  204:89    error    line too long (95 > 88 characters)  (line-length)
  207:18    warning  truthy value should be one of [false, true]  (truthy)
  207:26    warning  missing starting space in comment  (comments)
  211:18    warning  truthy value should be one of [false, true]  (truthy)
  211:26    warning  missing starting space in comment  (comments)
  214:1     error    too many blank lines (1 > 0)  (empty-lines)

test/salt/pillar/mysql.sls
  1:1       warning  missing document start "---"  (document-start)
  36:8      error    wrong indentation: expected 8 but found 7  (indentation)
  77:16     warning  truthy value should be one of [false, true]  (truthy)
  80:13     warning  truthy value should be one of [false, true]  (truthy)
  82:13     warning  truthy value should be one of [false, true]  (truthy)
  84:13     warning  truthy value should be one of [false, true]  (truthy)
  88:13     warning  truthy value should be one of [false, true]  (truthy)
  95:13     warning  truthy value should be one of [false, true]  (truthy)
  111:19    warning  truthy value should be one of [false, true]  (truthy)
  152:16    warning  truthy value should be one of [false, true]  (truthy)
  165:14    warning  truthy value should be one of [false, true]  (truthy)
  170:18    warning  truthy value should be one of [false, true]  (truthy)
  171:89    error    line too long (93 > 88 characters)  (line-length)
  174:18    warning  truthy value should be one of [false, true]  (truthy)
  175:89    error    line too long (111 > 88 characters)  (line-length)
  178:18    warning  truthy value should be one of [false, true]  (truthy)
  178:26    warning  missing starting space in comment  (comments)
  179:89    error    line too long (104 > 88 characters)  (line-length)
  182:18    warning  truthy value should be one of [false, true]  (truthy)
  182:26    warning  missing starting space in comment  (comments)
  183:89    error    line too long (103 > 88 characters)  (line-length)
  186:18    warning  truthy value should be one of [false, true]  (truthy)
  186:26    warning  missing starting space in comment  (comments)
  187:89    error    line too long (95 > 88 characters)  (line-length)
  190:18    warning  truthy value should be one of [false, true]  (truthy)
  190:26    warning  missing starting space in comment  (comments)
  191:89    error    line too long (102 > 88 characters)  (line-length)
  194:18    warning  truthy value should be one of [false, true]  (truthy)
  194:26    warning  missing starting space in comment  (comments)
  195:89    error    line too long (101 > 88 characters)  (line-length)
  198:18    warning  truthy value should be one of [false, true]  (truthy)
  198:26    warning  missing starting space in comment  (comments)
  199:89    error    line too long (95 > 88 characters)  (line-length)
  202:18    warning  truthy value should be one of [false, true]  (truthy)
  202:26    warning  missing starting space in comment  (comments)
  203:89    error    line too long (95 > 88 characters)  (line-length)
  206:18    warning  truthy value should be one of [false, true]  (truthy)
  206:26    warning  missing starting space in comment  (comments)
  210:18    warning  truthy value should be one of [false, true]  (truthy)
  210:26    warning  missing starting space in comment  (comments)
  213:1     error    too many blank lines (1 > 0)  (empty-lines)
```
This commit is contained in:
Imran Iqbal 2019-08-06 20:54:25 +01:00
parent 272a1ae4ae
commit 9f739fa8b4
No known key found for this signature in database
GPG key ID: 6D8629439D2B7819
10 changed files with 296 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.travis.yml
View file

@ -3,7 +3,7 @@
--- ---
stages: stages:
- test - test
- commitlint - lint
- name: release - name: release
if: branch = master AND type != pull_request if: branch = master AND type != pull_request
@ -49,16 +49,21 @@ script:
jobs: jobs:
include: include:
# Define the commitlint stage # Define the `lint` stage (runs `yamllint` and `commitlint`)
- stage: commitlint - stage: lint
language: node_js language: node_js
node_js: lts/* node_js: lts/*
before_install: skip before_install: skip
script: script:
# Install and run `yamllint`
- pip install --user yamllint
# yamllint disable-line rule:line-length
- yamllint -s . .yamllint pillar.example test/salt/pillar/mysql.sls
# Install and run `commitlint`
- npm install @commitlint/config-conventional -D - npm install @commitlint/config-conventional -D
- npm install @commitlint/travis-cli -D - npm install @commitlint/travis-cli -D
- commitlint-travis - commitlint-travis
# Define the release stage that runs semantic-release # Define the release stage that runs `semantic-release`
- stage: release - stage: release
language: node_js language: node_js
node_js: lts/* node_js: lts/*

18
.yamllint Normal file
View file

@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
# Extend the `default` configuration provided by `yamllint`
extends: default
# Files to ignore completely
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
# 2. Any YAML files using Jinja (result in `yamllint` syntax errors)
ignore: |
node_modules/
mysql/supported_sections.yaml
rules:
line-length:
# Increase from default of `80`
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
max: 88

57
mysql/defaults.yaml
View file

@ -1,14 +1,10 @@
# vim: sts=2 ts=2 sw=2 et ai # -*- coding: utf-8 -*-
# # vim: ft=yaml
---
mysql: mysql:
serverpkg: mysql-server serverpkg: mysql-server
clientpkg: mysql-client clientpkg: mysql-client
service: mysql service: mysql
{%- if grains.pythonversion[0] == 2 %}
pythonpkg: python-mysqldb
{% else %}
pythonpkg: python3-mysqldb
{% endif %}
devpkg: mysql-devel devpkg: mysql-devel
debconf_utils: debconf-utils debconf_utils: debconf-utils
@ -40,66 +36,77 @@ mysql:
retries: 2 retries: 2
products: products:
community_server: community_server:
enabled: True enabled: true
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg
sum: 'md5=602a84390ecf3d82025b1d99fc594124' sum: 'md5=602a84390ecf3d82025b1d99fc594124'
isapp: False isapp: false
path: /usr/local/mysql path: /usr/local/mysql
app: mysql app: mysql
workbench: workbench:
enabled: True enabled: true
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg
sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611'
isapp: True isapp: true
path: /Applications/MySQLWorkbench/Contents/Versions/latest path: /Applications/MySQLWorkbench/Contents/Versions/latest
app: MySQLWorkbench app: MySQLWorkbench
cluster: cluster:
enabled: False enabled: false
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg
sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' sum: 'md5=0df975908e7d8e4e8c1003d95edf4721'
isapp: False isapp: false
path: /usr/local/mysqlcluster path: /usr/local/mysqlcluster
app: MySQLCluster app: MySQLCluster
router: router:
enabled: False enabled: false
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg
sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6'
isapp: False isapp: false
app: MySQLRouter app: MySQLRouter
utilities: utilities:
enabled: False enabled: false
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg
sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8'
isapp: True ## ?? isapp: true ## ??
app: MySQLUtilties app: MySQLUtilties
shell: shell:
enabled: False enabled: false
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg
sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363'
isapp: True ## ?? isapp: true ## ??
app: MySQLShell app: MySQLShell
proxy: proxy:
enabled: False enabled: false
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz
sum: 'md5=107df22412aa8c483d2021e1af24ee22' sum: 'md5=107df22412aa8c483d2021e1af24ee22'
connector: connector:
enabled: False enabled: false
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz
sum: 'md5=dece7fe5607918ba68499ef07c31508d' sum: 'md5=dece7fe5607918ba68499ef07c31508d'
forvisualstudio: forvisualstudio:
enabled: False enabled: false
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip
sum: 'md5=fcf39316505ee2921e31a431eae77a9c' sum: 'md5=fcf39316505ee2921e31a431eae77a9c'
forexcel: forexcel:
enabled: False enabled: false
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip
sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3'
notifier: notifier:
enabled: False enabled: false
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip
sum: 'md5=349f1994681763fd6626a8ddf6be5363' sum: 'md5=349f1994681763fd6626a8ddf6be5363'
#The following dict names are reserved for pillar data (see pillar.example) # The following dict names are reserved for pillar data (see pillar.example)
global: {} global: {}
clients: {} clients: {}
library: {} library: {}

64
mysql/map.jinja
View file

@ -1,17 +1,61 @@
{% import_yaml "mysql/defaults.yaml" as defaults %} # -*- coding: utf-8 -*-
{% import_yaml "mysql/osfamilymap.yaml" as osfamilymap %} # vim: ft=jinja
{% import_yaml "mysql/osmap.yaml" as osmap %}
{% set mysql = salt['grains.filter_by']( {#- Get the `tplroot` from `tpldir` #}
defaults, {%- set tplroot = tpldir.split('/')[0] %}
{#- Start imports as #}
{%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
{%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}
{%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %}
{#- Retrieve the config dict only once #}
{%- set _config = salt['config.get'](tplroot, default={}) %}
{%- set py_ver_settings = {
2: {'pythonpkg': 'python-mysqldb'},
3: {'pythonpkg': 'python3-mysqldb'},
} %}
{%- set defaults = salt['grains.filter_by'](
py_ver_settings,
default=grains.pythonversion[0],
merge=salt['grains.filter_by'](
default_settings,
default=tplroot,
merge=salt['grains.filter_by']( merge=salt['grains.filter_by'](
osfamilymap, osfamilymap,
grain='os_family', grain='os_family',
merge=salt['grains.filter_by']( merge=salt['grains.filter_by'](
osmap, osmap,
grain='os', grain='os',
merge=salt['pillar.get']('mysql', {}), merge=salt['grains.filter_by'](
), osfingermap,
), grain='osfinger',
base='mysql', merge=salt['grains.filter_by'](
) %} _config,
default='lookup'
)
)
)
)
)
)
%}
{%- set config = salt['grains.filter_by'](
{'defaults': defaults},
default='defaults',
merge=_config
)
%}
{%- set mysql = config %}
{#- Post-processing for specific non-YAML customisations #}
{%- if grains.os == 'MacOS' %}
{%- set macos_user = salt['pillar.get']('mysql:user', salt['cmd.run']("stat -f '%Su' /dev/console")) %}
{%- set macos_group = salt['pillar.get']('mysql:group', salt['cmd.run']("stat -f '%Sg' /dev/console")) %}
{%- do mysql.macos.update({'user': macos_user}) %}
{%- do mysql.macos.update({'group': macos_group}) %}
{%- endif %}

52
mysql/osfamilymap.yaml
View file

@ -1,15 +1,8 @@
# vim: sts=2 ts=2 sw=2 et ai # -*- coding: utf-8 -*-
# # vim: ft=yaml
---
Debian: Debian:
{% if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int >= 9 %}
serverpkg: mariadb-server
service: mariadb
clientpkg: mariadb-client
devpkg: libmariadbclient-dev
{% else %}
devpkg: libmysqlclient-dev devpkg: libmysqlclient-dev
{% endif %}
config: config:
sections: sections:
@ -31,9 +24,9 @@ Debian:
query_cache_size: 16M query_cache_size: 16M
expire_logs_days: 10 expire_logs_days: 10
max_binlog_size: 100M max_binlog_size: 100M
#innodb_flush_log_at_trx_commit: 1 # innodb_flush_log_at_trx_commit: 1
#innodb_lock_wait_timeout: 50 # innodb_lock_wait_timeout: 50
#innodb_file_per_table: noarg_present # innodb_file_per_table: noarg_present
mysqldump: mysqldump:
quick: noarg_present quick: noarg_present
quote_names: noarg_present quote_names: noarg_present
@ -42,31 +35,18 @@ Debian:
key_buffer_size: 16M key_buffer_size: 16M
append: | append: |
!includedir /etc/mysql/conf.d/ !includedir /etc/mysql/conf.d/
# {% if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int >= 9 -%}
# !includedir /etc/mysql/mariadb.conf.d/
# {%- endif %}
RedHat: RedHat:
#https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
{%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int in [7] %}
{% set fork = 'mariadb' %}
serverpkg: mariadb-server
service: mariadb
devpkg: mariadb-devel
{%- else %}
{% set fork = 'mysql' %}
service: mysqld service: mysqld
{%- endif %} clientpkg: mysql
clientpkg: {{ fork }}
pythonpkg: MySQL-python pythonpkg: MySQL-python
config: config:
file: /etc/my.cnf file: /etc/my.cnf
sections: sections:
client: client:
mysqld_safe: mysqld_safe:
log_error: /var/log/{{ fork }}/mysqld.log log_error: /var/log/mysql/mysqld.log
pid_file: /var/run/{{ fork }}/mysqld.pid pid_file: /var/run/mysql/mysqld.pid
mysqld: mysqld:
socket: /var/lib/mysql/mysql.sock socket: /var/lib/mysql/mysql.sock
bind_address: 127.0.0.1 bind_address: 127.0.0.1
@ -75,12 +55,7 @@ RedHat:
Suse: Suse:
serverpkg: mariadb serverpkg: mariadb
clientpkg: mariadb-client clientpkg: mariadb-client
{%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int == 42 %}
# "old" package name up to Leap 42.x
pythonpkg: python-PyMySQL
{% else %}
pythonpkg: python2-pymysql pythonpkg: python2-pymysql
{% endif %}
config: config:
file: /etc/my.cnf file: /etc/my.cnf
@ -94,7 +69,7 @@ Suse:
datadir: datadir:
tmpdir: tmpdir:
innodb_file_format: Barracuda innodb_file_format: Barracuda
innodb_file_per_table: ON innodb_file_per_table: 'ON'
server-id: 1 server-id: 1
sql_mode: NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES sql_mode: NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
mysqld_multi: mysqld_multi:
@ -178,7 +153,7 @@ Gentoo:
default_character_set: utf8 default_character_set: utf8
myisamchk: myisamchk:
character_sets_dir: /usr/share/mysql/charsets character_sets_dir: /usr/share/mysql/charsets
key_buffer: 20M ##????? key_buffer_size ? key_buffer: 20M ## ????? key_buffer_size ?
sort_buffer_size: 20M sort_buffer_size: 20M
read_buffer: 2M read_buffer: 2M
write_buffer: 2M write_buffer: 2M
@ -188,7 +163,8 @@ Gentoo:
err_log: /var/log/mysql/mysql.err err_log: /var/log/mysql/mysql.err
mysqld: mysqld:
character_set_serverpkg: utf8 character_set_serverpkg: utf8
# note: the gentoo init.d script specifically needs pid-file (dash not underscore) # note: the gentoo init.d script specifically needs pid-file
# (dash not underscore)
pid-file: /var/run/mysqld/mysqld.pid pid-file: /var/run/mysqld/mysqld.pid
log_error: /var/log/mysql/mysqld.err log_error: /var/log/mysql/mysqld.err
basedir: /usr basedir: /usr
@ -217,7 +193,7 @@ Gentoo:
innodb_lock_wait_timeout: 50 innodb_lock_wait_timeout: 50
innodb_file_per_table: noarg_present innodb_file_per_table: noarg_present
isamchk: isamchk:
key_buffer: 20M ##????? key_buffer_size ? key_buffer: 20M ## ????? key_buffer_size ?
sort_buffer_size: 20M sort_buffer_size: 20M
read_buffer: 2M read_buffer: 2M
write_buffer: 2M write_buffer: 2M

67
mysql/osfingermap.yaml Normal file
View file

@ -0,0 +1,67 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
# Debian
Debian-10:
serverpkg: mariadb-server
service: mariadb
clientpkg: mariadb-client
devpkg: libmariadbclient-dev
config:
append: |
!includedir /etc/mysql/conf.d/
# !includedir /etc/mysql/mariadb.conf.d/
Debian-9:
serverpkg: mariadb-server
service: mariadb
clientpkg: mariadb-client
devpkg: libmariadbclient-dev
config:
append: |
!includedir /etc/mysql/conf.d/
# !includedir /etc/mysql/mariadb.conf.d/
# Ubuntu
Ubuntu-18.04:
serverpkg: mariadb-server
# service: mariadb
clientpkg: mariadb-client
# devpkg: libmariadbclient-dev
Ubuntu-16.04:
serverpkg: mariadb-server
# service: mariadb
clientpkg: mariadb-client
# devpkg: libmariadbclient-dev
# Redhat
Redhat-7:
# https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
serverpkg: mariadb-server
service: mariadb
clientpkg: mariadb
devpkg: mariadb-devel
config:
sections:
mysqld_safe:
log_error: /var/log/mariadb/mysqld.log
pid_file: /var/run/mariadb/mysqld.pid
# CentOS
CentOS Linux-7:
# https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
serverpkg: mariadb-server
service: mariadb
clientpkg: mariadb
devpkg: mariadb-devel
config:
sections:
mysqld_safe:
log_error: /var/log/mariadb/mysqld.log
pid_file: /var/run/mariadb/mysqld.pid
server_config:
sections:
mysqld_safe:
log_error: /var/log/mariadb/mysqld.log
pid_file: /var/run/mariadb/mysqld.pid
# Suse
Leap-42:
pythonpkg: python-PyMySQL

26
mysql/osmap.yaml
View file

@ -1,13 +1,6 @@
# vim: ft=sls # -*- coding: utf-8 -*-
# vim: sts=2 ts=2 sw=2 et ai # vim: ft=yaml
---
{% if grains.os == 'MacOS' %}
MacOS:
macos:
user: {{ salt['pillar.get']('mysql:user', salt['cmd.run']("stat -f '%Su' /dev/console")) }}
group: {{ salt['pillar.get']('mysql:group', salt['cmd.run']("stat -f '%Sg' /dev/console")) }}
{% endif %}
Debian: Debian:
service: mysql service: mysql
@ -23,22 +16,13 @@ Ubuntu:
!includedir /etc/mysql/conf.d/ !includedir /etc/mysql/conf.d/
CentOS: CentOS:
# https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
{%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int in [7] %}
{% set fork = 'mariadb' %}
{% set service = 'mariadb' %}
{%- else %}
{% set fork = 'mysql' %}
{% set service = 'mysqld' %}
{%- endif %}
config_directory: /etc/my.cnf.d/ config_directory: /etc/my.cnf.d/
server_config: server_config:
file: server.cnf file: server.cnf
sections: sections:
mysqld_safe: mysqld_safe:
log_error: /var/log/{{ fork }}/mysqld.log log_error: /var/log/mysql/mysqld.log
pid_file: /var/run/{{ fork }}/mysqld.pid pid_file: /var/run/mysql/mysqld.pid
mysqld: mysqld:
socket: /var/lib/mysql/mysql.sock socket: /var/lib/mysql/mysql.sock
bind_address: 127.0.0.1 bind_address: 127.0.0.1

67
pillar.example
View file

@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
mysql: mysql:
global: global:
client-server: client-server:
@ -74,26 +77,26 @@ mysql:
collate: utf8_general_ci collate: utf8_general_ci
# Delete DB # Delete DB
- name: obsolete_db - name: obsolete_db
present: False present: false
schema: schema:
foo: foo:
load: True load: true
source: salt://{{ tpldir }}/files/foo.schema source: salt://{{ tpldir }}/files/foo.schema
bar: bar:
load: False load: false
baz: baz:
load: True load: true
source: salt://{{ tpldir }}/files/baz.schema.tmpl source: salt://{{ tpldir }}/files/baz.schema.tmpl
template: jinja template: jinja
qux: qux:
load: True load: true
source: salt://{{ tpldir }}/files/qux.schema.tmpl source: salt://{{ tpldir }}/files/qux.schema.tmpl
template: jinja template: jinja
context: context:
encabulator: Turbo encabulator: Turbo
girdlespring: differential girdlespring: differential
quux: quux:
load: True load: true
source: salt://{{ tpldir }}/files/qux.schema.tmpl source: salt://{{ tpldir }}/files/qux.schema.tmpl
template: jinja template: jinja
context: context:
@ -109,14 +112,14 @@ mysql:
databases: databases:
- database: foo - database: foo
grants: ['select', 'insert', 'update'] grants: ['select', 'insert', 'update']
escape: True escape: true
- database: bar - database: bar
grants: ['all privileges'] grants: ['all privileges']
bob: bob:
password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
host: '%' # Any host host: '%' # Any host
ssl: True ssl: true
ssl-X509: True ssl-X509: true
ssl-SUBJECT: Subject ssl-SUBJECT: Subject
ssl-ISSUER: Name ssl-ISSUER: Name
ssl-CIPHER: Cipher ssl-CIPHER: Cipher
@ -127,8 +130,8 @@ mysql:
# use two '%' # use two '%'
- database: '`foo\_%%`' - database: '`foo\_%%`'
grants: ['all privileges'] grants: ['all privileges']
grant_option: True grant_option: true
escape: False escape: false
- database: bar - database: bar
table: foobar table: foobar
grants: ['select', 'insert', 'update', 'delete'] grants: ['select', 'insert', 'update', 'delete']
@ -149,8 +152,8 @@ mysql:
# Remove a user # Remove a user
obsoleteuser: obsoleteuser:
host: localhost host: localhost
# defaults to True # defaults to true
present: False present: false
# Override any names defined in map.jinja # Override any names defined in map.jinja
# serverpkg: mysql-server # serverpkg: mysql-server
@ -162,53 +165,63 @@ mysql:
# Install MySQL headers # Install MySQL headers
dev: dev:
# Install dev package - defaults to False # Install dev package - defaults to false
install: False install: false
macos: macos:
products: products:
community_server: community_server:
enabled: True # default enabled: true # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg
sum: 'md5=602a84390ecf3d82025b1d99fc594124' sum: 'md5=602a84390ecf3d82025b1d99fc594124'
workbench: workbench:
enabled: True # default enabled: true # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg
sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611'
cluster: cluster:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg
sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' sum: 'md5=0df975908e7d8e4e8c1003d95edf4721'
router: router:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg
sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6'
utilities: utilities:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg
sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8'
shell: shell:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg
sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363'
proxy: proxy:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz
sum: 'md5=107df22412aa8c483d2021e1af24ee22' sum: 'md5=107df22412aa8c483d2021e1af24ee22'
connector: connector:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz
sum: 'md5=dece7fe5607918ba68499ef07c31508d' sum: 'md5=dece7fe5607918ba68499ef07c31508d'
forvisualstudio: forvisualstudio:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip
sum: 'md5=fcf39316505ee2921e31a431eae77a9c' sum: 'md5=fcf39316505ee2921e31a431eae77a9c'
forexcel: forexcel:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip
sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3'
notifier: notifier:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip
sum: 'md5=349f1994681763fd6626a8ddf6be5363' sum: 'md5=349f1994681763fd6626a8ddf6be5363'

3
test/integration/default/inspec.yml
View file

@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
name: default name: default
title: mysql formula title: mysql formula
maintainer: SaltStack Formulas maintainer: SaltStack Formulas

67
test/salt/pillar/mysql.sls
View file

@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
mysql: mysql:
global: global:
client-server: client-server:
@ -74,25 +77,25 @@ mysql:
collate: utf8_general_ci collate: utf8_general_ci
# Delete DB # Delete DB
- name: obsolete_db - name: obsolete_db
present: False present: false
schema: schema:
foo: foo:
load: False load: false
bar: bar:
load: False load: false
baz: baz:
load: True load: true
source: salt://{{ tpldir }}/files/baz.schema.tmpl source: salt://{{ tpldir }}/files/baz.schema.tmpl
template: jinja template: jinja
qux: qux:
load: True load: true
source: salt://{{ tpldir }}/files/qux.schema.tmpl source: salt://{{ tpldir }}/files/qux.schema.tmpl
template: jinja template: jinja
context: context:
encabulator: Turbo encabulator: Turbo
girdlespring: differential girdlespring: differential
quux: quux:
load: True load: true
source: salt://{{ tpldir }}/files/qux.schema.tmpl source: salt://{{ tpldir }}/files/qux.schema.tmpl
template: jinja template: jinja
context: context:
@ -108,14 +111,14 @@ mysql:
databases: databases:
- database: foo - database: foo
grants: ['select', 'insert', 'update'] grants: ['select', 'insert', 'update']
escape: True escape: true
- database: bar - database: bar
grants: ['all privileges'] grants: ['all privileges']
# bob: # bob:
# password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' # password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
# host: '%' # Any host # host: '%' # Any host
# ssl: True # ssl: true
# ssl-X509: True # ssl-X509: true
# ssl-SUBJECT: Subject # ssl-SUBJECT: Subject
# ssl-ISSUER: Name # ssl-ISSUER: Name
# ssl-CIPHER: Cipher # ssl-CIPHER: Cipher
@ -126,8 +129,8 @@ mysql:
# # use two '%' # # use two '%'
# - database: '`foo\_%%`' # - database: '`foo\_%%`'
# grants: ['all privileges'] # grants: ['all privileges']
# grant_option: True # grant_option: true
# escape: False # escape: false
# - database: bar # - database: bar
# table: foobar # table: foobar
# grants: ['select', 'insert', 'update', 'delete'] # grants: ['select', 'insert', 'update', 'delete']
@ -148,8 +151,8 @@ mysql:
# Remove a user # Remove a user
obsoleteuser: obsoleteuser:
host: localhost host: localhost
# defaults to True # defaults to true
present: False present: false
# Override any names defined in map.jinja # Override any names defined in map.jinja
# serverpkg: mysql-server # serverpkg: mysql-server
@ -161,53 +164,63 @@ mysql:
# Install MySQL headers # Install MySQL headers
dev: dev:
# Install dev package - defaults to False # Install dev package - defaults to false
install: False install: false
macos: macos:
products: products:
community_server: community_server:
enabled: True # default enabled: true # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg
sum: 'md5=602a84390ecf3d82025b1d99fc594124' sum: 'md5=602a84390ecf3d82025b1d99fc594124'
workbench: workbench:
enabled: True # default enabled: true # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg
sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611'
cluster: cluster:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg
sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' sum: 'md5=0df975908e7d8e4e8c1003d95edf4721'
router: router:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg
sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6'
utilities: utilities:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg
sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8'
shell: shell:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg
sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363'
proxy: proxy:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz
sum: 'md5=107df22412aa8c483d2021e1af24ee22' sum: 'md5=107df22412aa8c483d2021e1af24ee22'
connector: connector:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz
sum: 'md5=dece7fe5607918ba68499ef07c31508d' sum: 'md5=dece7fe5607918ba68499ef07c31508d'
forvisualstudio: forvisualstudio:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip
sum: 'md5=fcf39316505ee2921e31a431eae77a9c' sum: 'md5=fcf39316505ee2921e31a431eae77a9c'
forexcel: forexcel:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip
sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3'
notifier: notifier:
enabled: False #default enabled: false # default
# yamllint disable-line rule:line-length
url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip
sum: 'md5=349f1994681763fd6626a8ddf6be5363' sum: 'md5=349f1994681763fd6626a8ddf6be5363'