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

Fix trailing whitespaces.

Browse source
This commit is contained in:
Heinz Wiesinger 2015-10-05 21:44:20 +02:00
parent e46262c0a8
commit d15e431468
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -94,5 +94,5 @@ Install the MySQL development libraries and header files.
.. note:: .. note::
Note that this state is not installed by the mysql meta-state unless you set Note that this state is not installed by the mysql meta-state unless you set
your pillar data accordingly. your pillar data accordingly.

6
mysql/defaults.yaml
View file

@ -37,9 +37,9 @@ Ubuntu:
myisam_recover: BACKUP myisam_recover: BACKUP
query_cache_limit: 1M query_cache_limit: 1M
query_cache_size: 16M query_cache_size: 16M
log_error: /var/log/mysql/error.log log_error: /var/log/mysql/error.log
expire_logs_days: 10 expire_logs_days: 10
max_binlog_size: 100M max_binlog_size: 100M
mysqldump: mysqldump:
quick: noarg_present quick: noarg_present
quote_names: noarg_present quote_names: noarg_present
@ -83,7 +83,7 @@ Debian:
query_cache_limit: 1M query_cache_limit: 1M
query_cache_size: 16M query_cache_size: 16M
expire_logs_days: 10 expire_logs_days: 10
max_binlog_size: 100M max_binlog_size: 100M
mysqldump: mysqldump:
quick: noarg_present quick: noarg_present
quote_names: noarg_present quote_names: noarg_present

2
mysql/files/my.cnf
View file

@ -31,7 +31,7 @@
{% if mvalue == "noarg_present" -%} {% if mvalue == "noarg_present" -%}
{{ mparam }} {{ mparam }}
{%- else -%} {%- else -%}
{{ mparam }}{{ '='|indent(indents, true) }} {{ mvalue }} {{ mparam }}{{ '='|indent(indents, true) }} {{ mvalue }}
{%- endif -%} {%- endif -%}
{%- endfor -%} {%- endfor -%}
{%- endif -%} {%- endif -%}

2
mysql/init.sls
View file

@ -16,7 +16,7 @@ include:
{% if mysql_dev %} {% if mysql_dev %}
- mysql.dev - mysql.dev
{% endif %} {% endif %}
{% if (db_states|length() + user_states|length()) > 0 %} {% if (db_states|length() + user_states|length()) > 0 %}
extend: extend:

2
pillar.example
View file

@ -8,7 +8,7 @@ mysql:
# If you only manage the dbs and users and the server is on # If you only manage the dbs and users and the server is on
# another host # another host
host: 123.123.123.123 host: 123.123.123.123
# my.cnf sections changes # my.cnf sections changes
mysqld: mysqld:
# you can use either underscore or hyphen in param names # you can use either underscore or hyphen in param names
bind-address: 0.0.0.0 bind-address: 0.0.0.0

4
scripts/import_users.py
View file

@ -15,7 +15,7 @@ parser.add_argument('user', metavar='user', help='mysql user that can show grant
parser.add_argument('password', metavar='password', help='user password') parser.add_argument('password', metavar='password', help='user password')
args = parser.parse_args() args = parser.parse_args()
# PARSE GRANTS # PARSE GRANTS
mysqlcon = MySQLdb.connect(host=args.host,user=args.user,passwd=args.password,db="mysql",use_unicode=True, charset='utf8') mysqlcon = MySQLdb.connect(host=args.host,user=args.user,passwd=args.password,db="mysql",use_unicode=True, charset='utf8')
mysqlCur = mysqlcon.cursor(MySQLdb.cursors.DictCursor) mysqlCur = mysqlcon.cursor(MySQLdb.cursors.DictCursor)
@ -42,7 +42,7 @@ for user in users:
mgrant = re.search( mgrant = re.search(
r"""GRANT ([\s,A-Z]+) ON `?([a-zA-Z0-9_\-*\\]*)`?\.`?([a-zA-Z0-9_\-*\\]*)`? TO .*""", r"""GRANT ([\s,A-Z]+) ON `?([a-zA-Z0-9_\-*\\]*)`?\.`?([a-zA-Z0-9_\-*\\]*)`? TO .*""",
row[0]) row[0])
if mgrant is not None: if mgrant is not None:
user['grants'].append({'grant': [x.strip() for x in mgrant.group(1).split(',')], 'database': mgrant.group(2).replace('\\',''), 'table': mgrant.group(3).replace('\\','')}) user['grants'].append({'grant': [x.strip() for x in mgrant.group(1).split(',')], 'database': mgrant.group(2).replace('\\',''), 'table': mgrant.group(3).replace('\\','')})
else: else:
print "ERROR: CAN NOT PARSE GRANTS: ",row[0] print "ERROR: CAN NOT PARSE GRANTS: ",row[0]