Browse Source

Use /var/run/mariadb on redhat

tags/1.0
Filip Pytloun 9 years ago
parent
commit
ca245cc1a7
4 changed files with 18 additions and 14 deletions
  1. +4
    -4
      galera/files/my.cnf
  2. +4
    -4
      galera/files/my.cnf.bootstrap
  3. +4
    -4
      galera/files/my.cnf.init
  4. +6
    -2
      galera/map.jinja

+ 4
- 4
galera/files/my.cnf View File

user=mysql user=mysql
basedir=/usr/ basedir=/usr/
datadir=/var/lib/mysql datadir=/var/lib/mysql
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
pid_file=mysqld.pid pid_file=mysqld.pid
port=3306 port=3306
log_error={{ service.log_file }} log_error={{ service.log_file }}
# Protocol version to use # Protocol version to use
# wsrep_protocol_version= # wsrep_protocol_version=
[MYSQL] [MYSQL]
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
#default_character_set=utf8 #default_character_set=utf8
[client] [client]
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
default_character_set=utf8 default_character_set=utf8
[mysqldump] [mysqldump]
max_allowed_packet = 512M max_allowed_packet = 512M
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
default_character_set=utf8 default_character_set=utf8
[MYSQLD_SAFE] [MYSQLD_SAFE]
pid_file=mysqld.pid pid_file=mysqld.pid

+ 4
- 4
galera/files/my.cnf.bootstrap View File

user=mysql user=mysql
basedir=/usr/ basedir=/usr/
datadir=/var/lib/mysql datadir=/var/lib/mysql
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
pid_file=mysqld.pid pid_file=mysqld.pid
port=3306 port=3306
log_error={{ service.log_file }} log_error={{ service.log_file }}
# Protocol version to use # Protocol version to use
# wsrep_protocol_version= # wsrep_protocol_version=
[MYSQL] [MYSQL]
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
#default_character_set=utf8 #default_character_set=utf8
[client] [client]
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
default_character_set=utf8 default_character_set=utf8
[mysqldump] [mysqldump]
max_allowed_packet = 512M max_allowed_packet = 512M
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
default_character_set=utf8 default_character_set=utf8
[MYSQLD_SAFE] [MYSQLD_SAFE]
pid_file=mysqld.pid pid_file=mysqld.pid

+ 4
- 4
galera/files/my.cnf.init View File

user=mysql user=mysql
basedir=/usr/ basedir=/usr/
datadir=/var/lib/mysql datadir=/var/lib/mysql
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
pid_file=mysqld.pid pid_file=mysqld.pid
port=3306 port=3306
log_error={{ service.log_file }} log_error={{ service.log_file }}
# Protocol version to use # Protocol version to use
# wsrep_protocol_version= # wsrep_protocol_version=
[MYSQL] [MYSQL]
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
#default_character_set=utf8 #default_character_set=utf8
[client] [client]
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
default_character_set=utf8 default_character_set=utf8
[mysqldump] [mysqldump]
max_allowed_packet = 512M max_allowed_packet = 512M
socket=/var/run/mysqld/mysqld.sock
socket={{ service.socket }}
default_character_set=utf8 default_character_set=utf8
[MYSQLD_SAFE] [MYSQLD_SAFE]
pid_file=mysqld.pid pid_file=mysqld.pid

+ 6
- 2
galera/map.jinja View File

'service': 'mysql', 'service': 'mysql',
'wsrep_provider': '/usr/lib/galera/libgalera_smm.so', 'wsrep_provider': '/usr/lib/galera/libgalera_smm.so',
'log_file': '/var/log/mysql.log', 'log_file': '/var/log/mysql.log',
'socket': '/var/run/mysqld/mysqld.sock',
'config': '/etc/mysql/my.cnf', 'config': '/etc/mysql/my.cnf',
}, },
'RedHat': { 'RedHat': {
'pkgs': ['galera', 'mariadb-galera-server', 'mariadb', 'MySQL-python', 'rsync'],
'pkgs': ['galera', 'mariadb-server', 'mariadb', 'MySQL-python', 'rsync'],
'service': 'mysqld', 'service': 'mysqld',
'wsrep_provider': '/usr/lib64/galera/libgalera_smm.so', 'wsrep_provider': '/usr/lib64/galera/libgalera_smm.so',
'log_file': '/var/log/mariadb/mariadb.log', 'log_file': '/var/log/mariadb/mariadb.log',
'socket': '/var/run/mariadb/mysqld.sock',
'config': '/etc/my.cnf', 'config': '/etc/my.cnf',
}, },
}, merge=salt['pillar.get']('galera:master')) %} }, merge=salt['pillar.get']('galera:master')) %}
'service': 'mysql', 'service': 'mysql',
'wsrep_provider': '/usr/lib/galera/libgalera_smm.so', 'wsrep_provider': '/usr/lib/galera/libgalera_smm.so',
'log_file': '/var/log/mysql.log', 'log_file': '/var/log/mysql.log',
'socket': '/var/run/mysqld/mysqld.sock',
'config': '/etc/mysql/my.cnf', 'config': '/etc/mysql/my.cnf',
}, },
'RedHat': { 'RedHat': {
'pkgs': ['galera', 'mariadb-galera-server', 'mariadb', 'MySQL-python', 'rsync'],
'pkgs': ['galera', 'mariadb-server', 'mariadb', 'MySQL-python', 'rsync'],
'service': 'mysqld', 'service': 'mysqld',
'wsrep_provider': '/usr/lib64/galera/libgalera_smm.so', 'wsrep_provider': '/usr/lib64/galera/libgalera_smm.so',
'log_file': '/var/log/mariadb/mariadb.log', 'log_file': '/var/log/mariadb/mariadb.log',
'socket': '/var/run/mariadb/mysqld.sock',
'config': '/etc/my.cnf', 'config': '/etc/my.cnf',
}, },
}, merge=salt['pillar.get']('galera:slave')) %} }, merge=salt['pillar.get']('galera:slave')) %}

Loading…
Cancel
Save