Skip to content
Browse files

account security should not fail if hostname == fqdn

This commit checks that hostaname and fqdn are not
equal before trying to remove both.
  • Loading branch information...
1 parent 8327830 commit 649bc16416b773387741ccf64c9bde05bb3ef2e8 Dan Bode committed Oct 28, 2012
Showing with 8 additions and 2 deletions.
  1. +8 −2 manifests/server/account_security.pp
View
10 manifests/server/account_security.pp
@@ -1,11 +1,17 @@
class mysql::server::account_security {
# Some installations have some default users which are not required.
# We remove them here. You can subclass this class to overwrite this behavior.
- database_user { [ "root@${::fqdn}", "root@${::hostname}", 'root@127.0.0.1', 'root@::1',
- "@${::fqdn}", "@${::hostname}", '@localhost', '@%' ]:
+ database_user { [ "root@${::fqdn}", 'root@127.0.0.1', 'root@::1',
+ "@${::fqdn}", '@localhost', '@%' ]:
ensure => 'absent',
require => Class['mysql::config'],
}
+ if ($::fqdn != $::hostname) {
+ database_user { ["root@${::hostname}", "@${::hostname}"]:
+ ensure => 'absent',
+ require => Class['mysql::config'],
+ }
+ }
database { 'test':
ensure => 'absent',
require => Class['mysql::config'],

0 comments on commit 649bc16

Please sign in to comment.
Something went wrong with that request. Please try again.