Skip to content

Commit 36f9ef4

Browse files
committed
Merge pull request #45 from bodepd/fix_issues_from_nans_massive_pull_request
Fix issues from nans massive pull request
2 parents 82d0ae5 + 0832a2c commit 36f9ef4

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lib/puppet/provider/database_user/mysql.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
def self.instances
1111
users = mysql("mysql", '-BNe' "select concat(User, '@',Host) as User from mysql.user").split("\n")
12-
users.select{ |user| user =~ /\.+@/ }.collect do |name|
12+
users.select{ |user| user =~ /.+@/ }.collect do |name|
1313
new(:name => name)
1414
end
1515
end

manifests/config.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
command => "service ${service_name} restart",
5252
refreshonly => true,
5353
path => '/sbin/:/usr/sbin/',
54-
subscribe => Exec['set_mysql_rootpw']
5554
}
5655

5756
# manage root password if it is set
@@ -66,6 +65,7 @@
6665
logoutput => true,
6766
unless => "mysqladmin -u root -p${root_password} status > /dev/null",
6867
path => '/usr/local/sbin:/usr/bin',
68+
notify => Exec['mysqld-restart']
6969
}
7070

7171
file { '/root/.my.cnf':

manifests/params.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939

4040
default: {
41-
fail("Unsupported operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
41+
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
4242
}
4343
}
4444

0 commit comments

Comments
 (0)