From cae3a3cbe85d1dffcd7a7a964669d2b758561dc0 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 5 Feb 2014 22:34:17 +0100
Subject: fix #6638 - remove the unless check & improve script

To workaround a limitation of the exec provider within puppet, we
do the unless check no within the script itself and ensure that
we use the password there.

https://labs.riseup.net/code/issues/6638
---
 manifests/server/base.pp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'manifests/server')

diff --git a/manifests/server/base.pp b/manifests/server/base.pp
index da82e2f..2d55605 100644
--- a/manifests/server/base.pp
+++ b/manifests/server/base.pp
@@ -50,7 +50,6 @@ class mysql::server::base {
 
   exec { 'mysql_set_rootpw':
     command     => '/usr/local/sbin/setmysqlpass.sh',
-    unless      => 'mysqladmin -uroot status > /dev/null',
     require     => [ File['mysql_setmysqlpass.sh'], Service['mysql'] ],
     # this is for security so that we only change the password
     # if the password file itself has changed
-- 
cgit v1.2.3