Fix linting

.travis.yml

@@ -5,7 +5,3 @@ install:
 
 script:
   - puppet-lint --fail-on-warnings --no-2sp_soft_tabs-check --no-hard_tabs-check --no-names_containing_dash-check --no-autoloader_layout-check --no-nested_classes_or_defines-check modules
-
-notifications:
-  slack:
-    secure: JbcRVXdj9FyVH6kbM0tSYi41+5AfChF4AcN76ibUAMQspqp5xna+cdqXxQiLzG9uzgX4dT/vy1QpTI6pJYtru6N3NhX5lMkfDT2gQr9/h5oHjqv/WStPuCXjsUQIS55MnOcNwNjIwyq6PfiFuX5Zn99YdogCa7mdkgQ5TggujBAexZkXUhnXLdZ+/GsLnUeUkdjeIBHDoYrh+/WYeJ94Fmf9vsgEmP6LULnGwqt4n+tLFkqWS9/q6jirbctl+SlN/UdVuuecozvDAkpm5qB52oEjcZTm7IIjrRGq8Hc8xWNYAxOjKjk56trYRZGYgeo87lYcQ+YHtqb82IZNKD3EuHLtbz1nw/jmEsWEv4nBzoKos/9RXw+9Hzm7NFrooqJwX5ThbdjJNQEsnqloXyehKiOpIznf6OnHoOdFLZQfFiOhyUj3RPrQoCKNE9iTLgLb9QE3NljQZW5GBmvAawj1bEF3xymxBS98JZc8d65kLG3q9iwn06MP2RnD2SOlGLl9ECmNLWB4Hcb3AfGUAMKqaZX/rWmT71NvBvVjBTWZSsYQ4JyIMzpFkxi746ODZzxyk6nR8VbtQtHbC3qZAtS5jQANi56p/eiKyXe3OyDtzmaLyxGbe0hbMb2RpcTXSkn5u/oxd26HFGcuELzKQvC9ygPeo0xl+Y82dQ9+MmbTb+c=

modules/mariadb/manifests/init.pp

@@ -20,27 +20,28 @@
 		},
 	}
 
-	class mysql_mariadb inherits mysql {
-		Class['mysql::server'] {
-			package_name     => 'mariadb-server',
-			package_ensure   => 'latest',
-			service_name     => 'mysql',
-			root_password    => $config['database']['password'],
-			bindings_enable  => true,
-			override_options => {
-				mysqld      => {
-					'log-error' => '/var/log/mysql/mariadb.log',
-					'pid-file'  => '/var/run/mysqld/mysqld.pid',
-				},
-				mysqld_safe => {
-					'log-error' => '/var/log/mysql/mariadb.log',
-				},
-			},
-		}
-	}
-
 	package { 'mariadb-server':
 		ensure  => installed,
 		require => [ Apt::Source['mariadb'], Class['mysql::server'] ]
 	}
 }
+
+# Inherit the MySQL class and adjust it for MariaDB.
+class mysql::mariadb inherits mysql {
+	Class['mysql::server'] {
+		package_name     => 'mariadb-server',
+		package_ensure   => 'latest',
+		service_name     => 'mysql',
+		root_password    => $config['database']['password'],
+		bindings_enable  => true,
+		override_options => {
+			mysqld      => {
+				'log-error' => '/var/log/mysql/mariadb.log',
+				'pid-file'  => '/var/run/mysqld/mysqld.pid',
+			},
+			mysqld_safe => {
+				'log-error' => '/var/log/mysql/mariadb.log',
+			},
+		},
+	}
+}