summaryrefslogtreecommitdiffstats
path: root/manifests/init.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp33
1 files changed, 27 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index fc33154..755d2c1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,7 +8,19 @@ import "passwords"
class mysql::server {
include passwords
include variables
-
+
+ case $mysql_grade{
+ community: {
+ $mysql_server_package = "MySQL-server-community"
+ $mysql_client_package = "MySQL-client-community"
+ $mysql_service_name = "mysql"
+ }
+ default: {
+ $mysql_server_package = "mysql-server"
+ $mysql_client_package = "mysql"
+ $mysql_service_name = "mysqld"
+ }
+ }
group { "mysql":
ensure => present,
require => User["mysql"],
@@ -20,17 +32,18 @@ class mysql::server {
}
package { "mysql-client":
- name => "MySQL-client-community",
+ name => $mysql_client_package,
ensure => installed,
}
package { "mysql-server":
- name => "MySQL-server-community",
+ name => $mysql_server_package,
ensure => installed,
require => Package["mysql-client"],
}
service { "mysql":
+ name => $mysql_service_name,
ensure => running,
hasstatus => true,
require => Package["mysql-server"],
@@ -122,16 +135,24 @@ class mysql::m2m inherits mysql::server {
}
define mysql::mysql_config ($binary_logging){
+ case $mysql_grade{
+ community: {
+ $mysql_config = "mysql/my.cnf.erb"
+ }
+ default: {
+ $mysql_config = "mysql/my.cnf.5.0.erb"
+ }
+ }
file { "/etc/my.cnf":
ensure => present,
owner => "mysql",
group => "mysql",
mode => 0644,
- content => template("mysql/my.cnf.erb"),
+ content => template("$mysql_config"),
require => [Service["mysql"],Exec["grants all to replication user"]]
}
exec { "restart mysql server":
- command => "service mysql restart",
+ command => "service $mysql_service_name restart",
unless => "$mysql_cmd_repl_with_pwd --execute=\"show master status;\" | grep mysqllog",
require => File["/etc/my.cnf"],
}
@@ -162,7 +183,7 @@ define mysql::mysql_replication {
}
}
-define mysql::datasource($rootpw, $ds_name, $ds_owner, $ds_owner_pwd, $ds_user, $ds_user_pwd, $ds_schema, mysql_replication_user, mysql_replication_password, mysql_root_database, mysql_root_local_host, $ds_owner_permissions, $ds_user_permissions) {
+define mysql::datasource($rootpw, $ds_name, $ds_owner, $ds_owner_pwd, $ds_user, $ds_user_pwd, $ds_schema, $mysql_replication_user, $mysql_replication_password, $mysql_root_database, $mysql_root_local_host, $ds_owner_permissions, $ds_user_permissions) {
case $mysql_type {
standalone: {
$mysql_root_cmd = "/usr/bin/mysql --user=root --password=$rootpw "