Skip to content

Commit b70b3eb

Browse files
authored
Merge pull request #1403 from ghoneycutt/readme_simple_fixes
Fix broken link and style in documentation
2 parents 9ad32fd + 08dbcc2 commit b70b3eb

File tree

1 file changed

+39
-52
lines changed

1 file changed

+39
-52
lines changed

README.md

Lines changed: 39 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ This module manages both the installation and configuration of MySQL, as well as
3131

3232
To install a server with the default options:
3333

34-
`include '::mysql::server'`.
34+
`include mysql::server`.
3535

3636
To customize options, such as the root password or `/etc/my.cnf` settings, you must also pass in an override hash:
3737

3838
```puppet
39-
class { '::mysql::server':
39+
class { 'mysql::server':
4040
root_password => 'strongpassword',
4141
remove_default_accounts => true,
4242
restart => true,
43-
override_options => $override_options
43+
override_options => $override_options,
4444
}
4545
```
4646

@@ -61,7 +61,7 @@ To define server options, structure a hash structure of overrides in `mysql::ser
6161
$override_options = {
6262
'section' => {
6363
'item' => 'thing',
64-
}
64+
},
6565
}
6666
```
6767

@@ -82,7 +82,7 @@ If an option needs multiple instances, pass an array. For example,
8282
$override_options = {
8383
'mysqld' => {
8484
'replicate-do-db' => ['base1', 'base2'],
85-
}
85+
},
8686
}
8787
```
8888

@@ -139,14 +139,14 @@ If you have installed the mysql client in a non standard bin/sbin path you can s
139139

140140
```puppet
141141
mysql::db { 'mydb':
142-
user => 'myuser',
143-
password => 'mypass',
144-
host => 'localhost',
145-
grant => ['SELECT', 'UPDATE'],
146-
sql => '/path/to/sqlfile.gz',
147-
import_cat_cmd => 'zcat',
148-
import_timeout => 900,
149-
mysql_exec_path => '/opt/rh/rh-myql57/root/bin'
142+
user => 'myuser',
143+
password => 'mypass',
144+
host => 'localhost',
145+
grant => ['SELECT', 'UPDATE'],
146+
sql => '/path/to/sqlfile.gz',
147+
import_cat_cmd => 'zcat',
148+
import_timeout => 900,
149+
mysql_exec_path => '/opt/rh/rh-myql57/root/bin',
150150
}
151151
```
152152

@@ -159,15 +159,15 @@ To add custom MySQL configuration, place additional files into `includedir`. Thi
159159
If you want the password managed by puppet for `127.0.0.1` and `::1` as an end user you would need to explicitly manage them with additional manifest entries. For example:
160160

161161
```puppet
162-
mysql_user{ '[root@127.0.0.1]':
163-
ensure => present,
164-
password_hash => mysql::password($mysql::server::root_password),
165-
}
166-
167-
mysql_user{ 'root@::1':
168-
ensure => present,
169-
password_hash => mysql::password($mysql::server::root_password),
170-
}
162+
mysql_user { '[root@127.0.0.1]':
163+
ensure => present,
164+
password_hash => mysql::password($mysql::server::root_password),
165+
}
166+
167+
mysql_user { 'root@::1':
168+
ensure => present,
169+
password_hash => mysql::password($mysql::server::root_password),
170+
}
171171
```
172172

173173
**Note:** This module is not designed to carry out additional DNS and aliasing.
@@ -210,7 +210,8 @@ A login path is a set of options (host, user, password, port and socket) that sp
210210

211211
More information about MySQL login paths: https://dev.mysql.com/doc/refman/8.0/en/mysql-config-editor.html.
212212

213-
Some example for login paths:
213+
Some example for login paths:
214+
214215
```puppet
215216
mysql_login_path { 'client':
216217
owner => root,
@@ -270,21 +271,21 @@ class {'mysql::server':
270271
271272
# Note: Installing Percona-Server-server-57 also installs Percona-Server-client-57.
272273
# This shows how to install the Percona MySQL client on its own
273-
class {'mysql::client':
274-
package_name => 'Percona-Server-client-57'
274+
class { 'mysql::client':
275+
package_name => 'Percona-Server-client-57',
275276
}
276277
277278
# These packages are normally installed along with Percona-Server-server-57
278279
# If you needed to install the bindings, however, you could do so with this code
279280
class { 'mysql::bindings':
280-
client_dev_package_name => 'Percona-Server-shared-57',
281-
client_dev => true,
282-
daemon_dev_package_name => 'Percona-Server-devel-57',
283-
daemon_dev => true,
284-
perl_enable => true,
285-
perl_package_name => 'perl-DBD-MySQL',
286-
python_enable => true,
287-
python_package_name => 'MySQL-python',
281+
client_dev_package_name => 'Percona-Server-shared-57',
282+
client_dev => true,
283+
daemon_dev_package_name => 'Percona-Server-devel-57',
284+
daemon_dev => true,
285+
perl_enable => true,
286+
perl_package_name => 'perl-DBD-MySQL',
287+
python_enable => true,
288+
python_package_name => 'MySQL-python',
288289
}
289290
290291
# Dependencies definition
@@ -311,7 +312,7 @@ include apt
311312
312313
apt::source { 'mariadb':
313314
location => 'http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.3/ubuntu',
314-
release => $::lsbdistcodename,
315+
release => $::facts['os']['codename'],
315316
repos => 'main',
316317
key => {
317318
id => '177F4010FE56CA3336300305F1656F24C74CD1D8',
@@ -335,7 +336,7 @@ All the values set here are an example of a working minimal configuration.
335336
Specify the version of the package you want with the `package_ensure` parameter.
336337

337338
```puppet
338-
class {'::mysql::server':
339+
class { 'mysql::server':
339340
package_name => 'mariadb-server',
340341
package_ensure => '1:10.3.21+maria~xenial',
341342
service_name => 'mysqld',
@@ -355,7 +356,7 @@ class {'::mysql::server':
355356
# as shown in the Preliminary step of this example.
356357
Apt::Source['mariadb'] ~>
357358
Class['apt::update'] ->
358-
Class['::mysql::server']
359+
Class['mysql::server']
359360
360361
```
361362

@@ -637,7 +638,7 @@ For an extensive list of supported operating systems, see [metadata.json](https:
637638

638639
## Development
639640

640-
We are experimenting with a new tool for running acceptance tests. Its name is [puppet_litmus](https://github.com/puppetlabs/puppet_litmus) this replaces beaker as the test runner. To run the acceptance tests follow the instructions from this point [here](https://github.com/puppetlabs/puppet_litmus/wiki/Tutorial:-use-Litmus-to-execute-acceptance-tests-with-a-sample-module-(MoTD)#install-the-necessary-gems-for-the-module).
641+
We are experimenting with a new tool for running acceptance tests. Its name is [puppet_litmus](https://github.com/puppetlabs/puppet_litmus) this replaces beaker as the test runner. To run the acceptance tests follow the [instructions](https://puppetlabs.github.io/litmus/Running-acceptance-tests.html) from the Litmus documentation.
641642

642643
Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can't access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
643644

@@ -647,18 +648,4 @@ Check out our the complete [module contribution guide](https://puppet.com/docs/p
647648

648649
### Authors
649650

650-
This module is based on work by David Schmitt. The following contributors have contributed to this module (beyond Puppet Labs):
651-
652-
* Larry Ludwig
653-
* Christian G. Warden
654-
* Daniel Black
655-
* Justin Ellison
656-
* Lowe Schmidt
657-
* Matthias Pigulla
658-
* William Van Hevelingen
659-
* Michael Arnold
660-
* Chris Weyl
661-
* Daniël van Eeden
662-
* Jan-Otto Kröpke
663-
* Timothy Sven Nelson
664-
* Andreas Stürz
651+
This module is based on work by David Schmitt. Thank you to all of our [contributors](https://github.com/puppetlabs/puppetlabs-mysql/graphs/contributors).

0 commit comments

Comments
 (0)