merged with puzzle

1 files changed, 21 insertions, 29 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index a3542fc..e7c104a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -21,22 +21,18 @@ class mysql::server {
         centos: { include mysql::server::centos }
         default: { include mysql::server::base }
     }
-
     if $selinux {
         include mysql::selinux
     }
-
     if $use_munin {
         include mysql::munin
     }
 }
 
 class mysql::server::base {
-
     package { mysql-server:
         ensure => present,
     }
-
     file{'/etc/mysql/my.cnf':
             source => [
                 "puppet://$server/files/mysql/${fqdn}/my.cnf",
@@ -49,7 +45,6 @@ class mysql::server::base {
             notify => Service[mysql],
             owner => root, group => 0, mode => 0644;
     }
-
     file{'/var/lib/mysql/data':
         ensure => directory,
         require => Package[mysql-server],
@@ -67,43 +62,43 @@ class mysql::server::base {
     case $mysql_rootpw {
         '': { fail("You need to define a mysql root password! Please set \$mysql_rootpw in your site.pp or host config") }
     }
-
     file{'/opt/bin/setmysqlpass.sh':
         source => "puppet://$server/mysql/config/${operatingsystem}/setmysqlpass.sh",
         require => Package[mysql-server],
         owner => root, group => 0, mode => 0500;
     }        
-
     file {'/root/.my.cnf':
         content => template('mysql/root/my.cnf.erb'),
         require => [ Package[mysql-server] ],
         owner => root, group => 0, mode => 0400;
     }
-
     exec{'set_mysql_rootpw':
         command => "/opt/bin/setmysqlpass.sh $mysql_rootpw",
         unless => "mysqladmin -uroot status > /dev/null",
         require => [ File['/opt/bin/setmysqlpass.sh'], Package[mysql-server] ],
     }
-
    file{'/etc/cron.d/mysql_backup.cron':
-        source => [ "puppet://$server/mysql/backup/mysql_backup.cron.${operatingsystem}",
-                    "puppet://$server/mysql/backup/mysql_backup.cron" ],
-        require => [ Exec[set_mysql_rootpw], File['/root/.my.cnf'] ],
-        owner => root, group => 0, mode => 0600;
-    } 
-
-	service {mysql:
-		ensure => running,
-        enable => true,
-		hasstatus => true,
-		require => Package[mysql],
-	}
-
-	# Collect all databases and users
-	Mysql_database<<| tag == "mysql_${fqdn}" |>>
-	Mysql_user<<| tag == "mysql_${fqdn}"  |>>
-	Mysql_grant<<| tag == "mysql_${fqdn}" |>>
+       source => [ "puppet://$server/mysql/backup/mysql_backup.cron.${operatingsystem}",
+                   "puppet://$server/mysql/backup/mysql_backup.cron" ],
+       require => [ Exec[set_mysql_rootpw], File['/root/.my.cnf'] ],
+       owner => root, group => 0, mode => 0600;
+   }
+   file{'/etc/cron.weekly/mysql_optimize_tables.rb':
+       source => "puppet://$server/mysql/optimize/optimize_tables.rb",
+       require => [ Exec[set_mysql_rootpw], File['/root/.my.cnf'] ],
+       owner => root, group => 0, mode => 0700;
+   }
+   service {mysql:
+       ensure => running,
+       enable => true,
+       hasstatus => true,
+       require => Package[mysql],
+   }
+
+  # Collect all databases and users
+  Mysql_database<<| tag == "mysql_${fqdn}" |>>
+  Mysql_user<<| tag == "mysql_${fqdn}"  |>>
+  Mysql_grant<<| tag == "mysql_${fqdn}" |>>
 }
 
 class mysql::server::gentoo inherits mysql::server::base {
@@ -117,15 +112,12 @@ class mysql::server::clientpackage inherits mysql::server::base {
     package{mysql:
         ensure => present,
     }
-
     File['/opt/bin/setmysqlpass.sh']{
         require +> Package[mysql],
     }
-
     File['/root/.my.cnf']{
         require +> Package[mysql],
     }
-
     Exec['set_mysql_rootpw']{
         require +> Package[mysql],
     }