diff options
| author | Micah Anderson <micah@riseup.net> | 2012-03-07 11:05:49 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-03-07 11:05:49 -0500 |
| commit | 084f0cfb671c4f29a8ccf7261fba38b6cabd8435 (patch) | |
| tree | abaa170a40cdf707642fd4f58bb27faf45b79cb5 /manifests | |
| parent | 196560b997593d1913246c8fb8814ac7c9a9060e (diff) | |
| parent | e9ff8b6a233ad38b18fd4f64413ef0b89186b78f (diff) | |
Merge branch 'shared'
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/server/base.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/server/base.pp b/manifests/server/base.pp index 7ddff38..5b00ddc 100644 --- a/manifests/server/base.pp +++ b/manifests/server/base.pp @@ -55,7 +55,7 @@ class mysql::server::base { } exec { 'mysql_set_rootpw': - command => "/usr/local/sbin/setmysqlpass.sh ${mysql_rootpw}", + command => "/usr/local/sbin/setmysqlpass.sh", unless => "/usr/bin/mysqladmin -uroot status > /dev/null", require => [ File['mysql_setmysqlpass.sh'], Package['mysql-server'] ], refreshonly => true, |