add Debian support

1 files changed, 21 insertions, 14 deletions

diff --git a/manifests/server/base.pp b/manifests/server/base.pp
index da61e47..2fa3263 100644
--- a/manifests/server/base.pp
+++ b/manifests/server/base.pp
@@ -2,7 +2,8 @@ class mysql::server::base {
     package { mysql-server:
         ensure => present,
     }
-    file{'/etc/mysql/my.cnf':
+    file { 'mysql_main_cnf':
+            path => '/etc/mysql/my.cnf',
             source => [
                 "puppet://$server/modules/site-mysql/${fqdn}/my.cnf",
                 "puppet://$server/modules/site-mysql/my.cnf",
@@ -14,47 +15,53 @@ class mysql::server::base {
             notify => Service[mysql],
             owner => root, group => 0, mode => 0644;
     }
-    file{'/var/lib/mysql/data':
+    file { 'mysql_data_dir':
+        path => '/var/lib/mysql/data',
         ensure => directory,
         require => Package[mysql-server],
-        before => File['/etc/mysql/my.cnf'],
+        before => File['mysql_main_cnf'],
         owner => mysql, group => mysql, mode => 0755;
     }
 
-    file{'/var/lib/mysql/data/ibdata1':
+    file { 'mysql_ibdata1':
+        path => '/var/lib/mysql/data/ibdata1',
         ensure => file,
         require => Package[mysql-server],
-        before => File['/opt/bin/setmysqlpass.sh'],
+        before => File['mysql_setmysqlpass.sh'],
         owner => mysql, group => mysql, mode => 0660;
     }
 
     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':
+    file { 'mysql_setmysqlpass.sh':
+        path => '/usr/local/sbin/setmysqlpass.sh',
         source => "puppet://$server/modules/mysql/config/${operatingsystem}/setmysqlpass.sh",
         require => Package[mysql-server],
         owner => root, group => 0, mode => 0500;
     }        
-    file {'/root/.my.cnf':
+    file { 'mysql_root_cnf':
+        path => '/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",
+    exec { 'mysql_set_rootpw':
+        command => "/usr/local/sbin/setmysqlpass.sh $mysql_rootpw",
         unless => "mysqladmin -uroot status > /dev/null",
-        require => [ File['/opt/bin/setmysqlpass.sh'], Package[mysql-server] ],
+        require => [ File['mysql_setmysqlpass.sh'], Package[mysql-server] ],
     }
-   file{'/etc/cron.d/mysql_backup.cron':
+   file { 'mysql_backup_cron':
+       path => '/etc/cron.d/mysql_backup.cron',
        source => [ "puppet://$server/modules/mysql/backup/mysql_backup.cron.${operatingsystem}",
                    "puppet://$server/modules/mysql/backup/mysql_backup.cron" ],
-       require => [ Exec[set_mysql_rootpw], File['/root/.my.cnf'] ],
+       require => [ Exec[mysql_set_rootpw], File['mysql_root_cnf'] ],
        owner => root, group => 0, mode => 0600;
    }
-   file{'/etc/cron.weekly/mysql_optimize_tables.rb':
+   file { 'mysql_optimize_cron':
+       path => '/etc/cron.weekly/mysql_optimize_tables.rb',
        source => "puppet://$server/modules/mysql/optimize/optimize_tables.rb",
-       require => [ Exec[set_mysql_rootpw], File['/root/.my.cnf'] ],
+       require => [ Exec[mysql_set_rootpw], File['mysql_root_cnf'] ],
        owner => root, group => 0, mode => 0700;
    }
    service {mysql: