From 5191ded01172ee746eccc0e145562bda71f061ca Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 2 Apr 2010 17:48:13 +0200
Subject: move scripts to /usr/local/sbin, old scripts are getting removed by
 wiping the modules dir

---
 manifests/server.pp               | 3 ---
 manifests/server/base.pp          | 4 ++--
 manifests/server/cron/optimize.pp | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/manifests/server.pp b/manifests/server.pp
index 60fc93d..62ab599 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -1,8 +1,5 @@
 class mysql::server {
 
-    $mysql_moduledir = "${module_dir_path}/mysql"
-    module_dir { ['mysql', 'mysql/server']: }
-    
     case $operatingsystem {
       gentoo: { include mysql::server::gentoo }
       centos: { include mysql::server::centos }
diff --git a/manifests/server/base.pp b/manifests/server/base.pp
index 480eda9..b05deab 100644
--- a/manifests/server/base.pp
+++ b/manifests/server/base.pp
@@ -37,7 +37,7 @@ class mysql::server::base {
     }
     
     file { 'mysql_setmysqlpass.sh':
-        path => "${mysql_moduledir}/server/setmysqlpass.sh",
+        path => '/usr/local/sbin/setmysqlpass.sh',
         source => "puppet://${server}/modules/mysql/scripts/${operatingsystem}/setmysqlpass.sh",
         require => Package['mysql-server'],
         owner => root, group => 0, mode => 0500;
@@ -52,7 +52,7 @@ class mysql::server::base {
     }
     
     exec { 'mysql_set_rootpw':
-        command => "${mysql_moduledir}/server/setmysqlpass.sh ${mysql_rootpw}",
+        command => "/user/local/sbin/setmysqlpass.sh ${mysql_rootpw}",
         unless => "mysqladmin -uroot status > /dev/null",
         require => [ File['mysql_setmysqlpass.sh'], Package['mysql-server'] ],
         refreshonly => true,
diff --git a/manifests/server/cron/optimize.pp b/manifests/server/cron/optimize.pp
index 29ee66e..3d70884 100644
--- a/manifests/server/cron/optimize.pp
+++ b/manifests/server/cron/optimize.pp
@@ -1,13 +1,13 @@
 class mysql::server::cron::optimize {
 
    file { 'mysql_optimize_script':
-       path => "${mysql_moduledir}/server/optimize_tables.rb",
+       path => '/usr/local/sbin/optimize_mysql_tables.rb',
        source => "puppet://${server}/modules/mysql/scripts/optimize_tables.rb",
        owner => root, group => 0, mode => 0700;
    }
 
     cron { 'mysql_optimize_cron':
-        command => "${mysql_moduledir}/server/optimize_tables.rb",
+        command => '/usr/local/sbin/optimize_mysql_tables.rb',
         user => 'root',
         minute => 40,
         hour => 6,
-- 
cgit v1.2.3