Using just change_mysql_rootpw

1 files changed, 20 insertions, 26 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 8143a80..35bd0f5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,46 +4,40 @@
 
 class mysql {
   package { "mysql-client":
-      ensure  => installed,
+    ensure  => installed,
   }
 }
 
 class mysql::server inherits mysql {
   package { "mysql-server":
-      ensure  => installed,
+    ensure => installed,
   }
+
   service { "mysql":
-      ensure          => running,
-      enable          => true,
-      hasrestart      => true,
-      hasstatus       => true,
-      require         => Package["mysql-server"],
+    ensure     => running,
+    enable     => true,
+    hasrestart => true,
+    hasstatus  => true,
+    require    => Package["mysql-server"],
   }
 
   case $mysql_rootpw {
-      '': { fail("You need to define a mysql root password! Please set \$mysql_rootpw in your site.pp or host config") }
+    '': { fail("You need to define a mysql root password! Please set \$mysql_rootpw in your site.pp or host config") }
   }
 
-  file{ '/usr/local/sbin/setmysqlpass.sh':
-      source  => "puppet://$server/modules/mysql/setmysqlpass.sh",
-      require => Package[mysql-server],
-      owner   => root,
-      group   => root,
-      mode    => 0500,
+  file { '/usr/local/sbin/setmysqlpass.sh':
+    content => template('mysqk/setmysqlpass.sh.erb'),
+    require => Package[mysql-server],
+    owner   => root,
+    group   => root,
+    mode    => 0500,
   } 
 
-  exec{'set_mysql_rootpw':
-      command => "/usr/local/sbin/setmysqlpass.sh",
-      unless  => "mysqladmin -uroot status > /dev/null",
-      require => [ File['/usr/local/sbin/setmysqlpass.sh'], Package[mysql-server] ],
-      user    => root,
-  }
-
-  exec{'change_mysql_rootpw':
-      command     => "/usr/local/sbin/setmysqlpass.sh",
-      require     => [ File['/usr/local/sbin/setmysqlpass.sh'], Package[mysql-server] ],
-      refreshonly => true,
-      user        => root,
+  exec { 'change_mysql_rootpw':
+    command     => "/usr/local/sbin/setmysqlpass.sh",
+    require     => [ File['/usr/local/sbin/setmysqlpass.sh'], Package[mysql-server] ],
+    refreshonly => true,
+    user        => root,
   }
 
   mysql::cnf { "root":