opuppet/module-puppetlabs-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

account security should not fail if hostname == fqdn

Browse source 
This commit checks that hostaname and fqdn are not
equal before trying to remove both.
This commit is contained in:
Dan Bode 2012-10-28 21:40:11 -07:00
parent 832783040a
commit 649bc16416
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
manifests/server/account_security.pp
View file

@ -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'],