From f08deff9b59f4a139ae8764f1393069921eb7e66 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 25 Sep 2016 17:29:52 +0200 Subject: [PATCH] Add Vagrant and salt automation for gvamysql --- pillar/gnuviechadmin/gvamysql.sls | 10 ++ states/gnuviechadmin/base.sls | 1 + states/gnuviechadmin/gvamysql.sls | 28 +++++ states/gnuviechadmin/gvamysql/run_celery.sh | 12 ++ states/gnuviechadmin/gvamysql/settings.sh | 8 ++ states/mariadb-server/init.sls | 17 +++ states/mariadb-server/my.cnf | 129 ++++++++++++++++++++ 7 files changed, 205 insertions(+) create mode 100644 pillar/gnuviechadmin/gvamysql.sls create mode 100644 states/gnuviechadmin/gvamysql.sls create mode 100644 states/gnuviechadmin/gvamysql/run_celery.sh create mode 100644 states/gnuviechadmin/gvamysql/settings.sh create mode 100644 states/mariadb-server/init.sls create mode 100644 states/mariadb-server/my.cnf diff --git a/pillar/gnuviechadmin/gvamysql.sls b/pillar/gnuviechadmin/gvamysql.sls new file mode 100644 index 0000000..748da10 --- /dev/null +++ b/pillar/gnuviechadmin/gvamysql.sls @@ -0,0 +1,10 @@ +include: + - gnuviechadmin + - gnuviechadmin.queues.common + - gnuviechadmin.queues.gvamysql + +gnuviechadmin: + component: + name: gvamysql + amqp_user: mysql + mysql_admin_user: gvamysql diff --git a/states/gnuviechadmin/base.sls b/states/gnuviechadmin/base.sls index ba80969..fdc1989 100644 --- a/states/gnuviechadmin/base.sls +++ b/states/gnuviechadmin/base.sls @@ -17,6 +17,7 @@ gnuviechadmin-packages: - pkgs: - libyaml-dev - python-virtualenv + - virtualenv - python-dev - python-pip - gettext diff --git a/states/gnuviechadmin/gvamysql.sls b/states/gnuviechadmin/gvamysql.sls new file mode 100644 index 0000000..422da8d --- /dev/null +++ b/states/gnuviechadmin/gvamysql.sls @@ -0,0 +1,28 @@ +include: + - gnuviechadmin.base + - gnuviechadmin.celery + +gvamysql-mysql-user: + mysql_user.present: + - name: {{ salt['pillar.get']('gnuviechadmin:mysql_admin_user', 'gvamysql') }} + - host: '%' + - password: {{ salt['grains.get_or_set_hash']('gnuviechadmin.db_admin_password', 16) }} + +gvamysql-grants-all-dbs: + mysql_grants.present: + - grant: ALL PRIVILEGES + - database: '*.*' + - grant_option: True + - user: {{ salt['pillar.get']('gnuviechadmin:mysql_admin_user', 'gvamysql') }} + - password: {{ salt['grains.get_or_set_hash']('gnuviechadmin.db_admin_password', 16) }} + - host: '%' + - require: + - mysql_user: gvamysql-mysql-user + +gvamysql-packages: + pkg.installed: + - pkgs: + - libmariadbd-dev + - libmysqlclient-dev + - require_in: + - pkg: gnuviechadmin-packages diff --git a/states/gnuviechadmin/gvamysql/run_celery.sh b/states/gnuviechadmin/gvamysql/run_celery.sh new file mode 100644 index 0000000..bc64add --- /dev/null +++ b/states/gnuviechadmin/gvamysql/run_celery.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +set -ex + +. {{ home }}/gvasettings.sh + +unset LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \ + LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \ + LC_IDENTIFICATION LC_ALL + +cd {{ appdir }} +{{ virtualenv }}/bin/celery worker -A gvamysql -Q mysql --loglevel=INFO diff --git a/states/gnuviechadmin/gvamysql/settings.sh b/states/gnuviechadmin/gvamysql/settings.sh new file mode 100644 index 0000000..d8488b5 --- /dev/null +++ b/states/gnuviechadmin/gvamysql/settings.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +export GVAMYSQL_BROKER_URL='{{ broker_url }}' +export GVAMYSQL_RESULTS_REDIS_URL="redis://:{{ salt['pillar.get']('gnuviechadmin:redis_password') }}@{{ salt['pillar.get']('gnuviechadmin:redis_host') }}/0" +export GVAMYSQL_DBADMIN_HOST="{{ salt['pillar.get']('gnuviechadmin:mysql_admin_host', 'localhost') }}" +export GVAMYSQL_DBADMIN_PORT="{{ salt['pillar.get']('gnuviechadmin:mysql_admin_port', 3306) }}" +export GVAMYSQL_DBADMIN_USER="{{ salt['pillar.get']('gnuviechadmin:mysql_admin_user', 'gvamysql') }}" +export GVAMYSQL_DBADMIN_PASSWORD="{{ salt['grains.get_or_set_hash']('gnuviechadmin.db_admin_password', 16) }}" diff --git a/states/mariadb-server/init.sls b/states/mariadb-server/init.sls new file mode 100644 index 0000000..51d5ef8 --- /dev/null +++ b/states/mariadb-server/init.sls @@ -0,0 +1,17 @@ +mariadb-server: + pkg.installed + +mysql: + service.running: + - enable: true + - require: + - pkg: mariadb-server + +/etc/mysql/my.cnf: + file.managed: + - owner: root + - group: root + - mode: 0644 + - source: salt://mariadb-server/my.cnf + - watch_in: + - service: mysql diff --git a/states/mariadb-server/my.cnf b/states/mariadb-server/my.cnf new file mode 100644 index 0000000..469dfb5 --- /dev/null +++ b/states/mariadb-server/my.cnf @@ -0,0 +1,129 @@ +# +# The MySQL database server configuration file. +# +# You can copy this to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +# +# * Basic Settings +# +user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc-messages-dir = /usr/share/mysql +skip-external-locking +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +bind-address = 0.0.0.0 +# +# * Fine Tuning +# +key_buffer = 16M +max_allowed_packet = 16M +thread_stack = 192K +thread_cache_size = 8 +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched +myisam-recover = BACKUP +#max_connections = 100 +#table_cache = 64 +#thread_concurrency = 10 +# +# * Query Cache Configuration +# +query_cache_limit = 1M +query_cache_size = 16M +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +# +# Error log - should be very few entries. +# +#log_error = /var/log/mysql/error.log +# +# Here you can see queries with especially long duration +log_output = FILE +slow_query_log = 1 +slow_query_log_file = /var/log/mysql/mysql-slow.log +long_query_time = 2 +#log_queries_not_using_indexes + +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#log_bin = /var/log/mysql/mysql-bin.log +expire_logs_days = 10 +max_binlog_size = 100M +#binlog_do_db = include_database_name +#binlog_ignore_db = include_database_name +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + + + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completition + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!includedir /etc/mysql/conf.d/