annotate modules/website/manifests/mysql.pp @ 27:25405d1350ef puppet-3.6

Remove unnecessary log directory creation and try to fix SQL statement
author IBBoard <dev@ibboard.co.uk>
date Mon, 09 Mar 2015 03:30:18 +0000
parents aa40b53324e4
children 2078241de4ed
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
1 class website::mysql (
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
2 $mysqluser,
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
3 $mysqlpassword,
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
4 $mysqlsuffix = '',
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
5 $phpsuffix = '',
23
aa40b53324e4 Make MySQL Website class more flexible for supporting MariaDB
IBBoard <dev@ibboard.co.uk>
parents: 7
diff changeset
6 $phpmysqlsuffix = '',
aa40b53324e4 Make MySQL Website class more flexible for supporting MariaDB
IBBoard <dev@ibboard.co.uk>
parents: 7
diff changeset
7 $mysqlprefix = 'mysql')
0
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
8 {
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
9 class { 'mysql::client':
23
aa40b53324e4 Make MySQL Website class more flexible for supporting MariaDB
IBBoard <dev@ibboard.co.uk>
parents: 7
diff changeset
10 package_name => "${mysqlprefix}${mysqlsuffix}",
0
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
11 bindings_enable => false, #Deal with bindings manually
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
12 }
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
13 class { 'mysql::bindings':
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
14 php_enable => true,
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
15 php_package_name => "php${phpsuffix}-mysql${phpmysqlsuffix}",
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
16 }
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
17 class { 'mysql::server':
23
aa40b53324e4 Make MySQL Website class more flexible for supporting MariaDB
IBBoard <dev@ibboard.co.uk>
parents: 7
diff changeset
18 package_name => "${mysqlprefix}${mysqlsuffix}-server",
2
b0a6f4b93e10 Start optimising MySQL based on "MySQLTuner.pl" script
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
19 override_options => {
b0a6f4b93e10 Start optimising MySQL based on "MySQLTuner.pl" script
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
20 'mysqld' => {
b0a6f4b93e10 Start optimising MySQL based on "MySQLTuner.pl" script
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
21 'query_cache_size' => '32M',
5
f2056be70cb8 Increase memory a bit more for optimisation
IBBoard <dev@ibboard.co.uk>
parents: 4
diff changeset
22 'join_buffer_size' => '524288', #512K
f2056be70cb8 Increase memory a bit more for optimisation
IBBoard <dev@ibboard.co.uk>
parents: 4
diff changeset
23 'tmp_table_size' => '64M',
f2056be70cb8 Increase memory a bit more for optimisation
IBBoard <dev@ibboard.co.uk>
parents: 4
diff changeset
24 'max_heap_table_size' => '64M',
2
b0a6f4b93e10 Start optimising MySQL based on "MySQLTuner.pl" script
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
25 'table_open_cache' => '500',
5
f2056be70cb8 Increase memory a bit more for optimisation
IBBoard <dev@ibboard.co.uk>
parents: 4
diff changeset
26 'log-queries-not-using-indexes' => '1',
2
b0a6f4b93e10 Start optimising MySQL based on "MySQLTuner.pl" script
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
27 }
b0a6f4b93e10 Start optimising MySQL based on "MySQLTuner.pl" script
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
28 },
4
894e6287926f Fix "slow query" log - previously MySQL didn't have permission to write it
IBBoard <dev@ibboard.co.uk>
parents: 2
diff changeset
29 }
0
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
30 $username = strip($mysqluser)
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
31 $password = strip($mysqlpassword)
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
32 $configured_marker = '/etc/mysql/.is-configured'
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
33 exec { 'Rename root MySQL user for security':
27
25405d1350ef Remove unnecessary log directory creation and try to fix SQL statement
IBBoard <dev@ibboard.co.uk>
parents: 23
diff changeset
34 command => "mysql -u root -e 'UPDATE mysql.user SET User = \"$username\", Password = PASSWORD(\"$password\") WHERE User = \"root\"; DELETE FROM mysql.user WHERE User = \'\'; FLUSH PRIVILEGES;' && touch $configured_marker",
0
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
35 provider => shell,
23
aa40b53324e4 Make MySQL Website class more flexible for supporting MariaDB
IBBoard <dev@ibboard.co.uk>
parents: 7
diff changeset
36 creates => $configured_marker,
aa40b53324e4 Make MySQL Website class more flexible for supporting MariaDB
IBBoard <dev@ibboard.co.uk>
parents: 7
diff changeset
37 require => Class['mysql::server'],
0
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
38 }
956e484adc12 Initial public release of Puppet configs
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
39 }