updated mysql puppet module which may fix some errors, moved some pac…

…kages from dockerfile to puppet so they are available in docker and vagrant

Dockerfile

@@ -19,9 +19,6 @@ RUN export FACTER_db_username="piwik@localhost"
 RUN export FACTER_db_password="secure"
 RUN puppet apply --modulepath=/tmp/puppet/modules /tmp/puppet/site.pp
 
-RUN apt-get install -y net-tools telnet nmap
-RUN apt-get install -y socat dnsutils netcat inetutils-ping tree htop sudo software-properties-common
-
 ADD www /var/www
 
 ENTRYPOINT ["/bin/bash"]

puppet/modules/piwik/Modulefile

@@ -1,5 +1,5 @@
 name    'puppet-piwik'
-version '0.2.0'
+version '0.3.0'
 source 'UNKNOWN'
 author 'tsteur'
 license 'GPL v3 or later'

puppet/modules/piwik/manifests/base.pp

@@ -25,10 +25,18 @@
 
   package { 'facter': ensure => latest, require => Exec['base_apt-get_update'] }
 
+  package { 'dnsutils': ensure => latest, require => Exec['base_apt-get_update'] }
+
   package { 'sendmail': ensure => latest, require => Exec['base_apt-get_update'] }
 
   package { 'strace': ensure => latest, require => Exec['base_apt-get_update'] }
 
+  package { 'telnet': ensure => latest, require => Exec['base_apt-get_update'] }
+
+  package { 'nmap': ensure => latest, require => Exec['base_apt-get_update'] }
+
+  package { 'net-tools': ensure => latest, require => Exec['base_apt-get_update'] }
+
   package { 'tcpdump': ensure => latest, require => Exec['base_apt-get_update'] }
 
   package { 'wget': ensure => latest, require => Exec['base_apt-get_update'] }
@@ -38,6 +46,12 @@
   package { 'cutycapt': ensure => latest, require => Exec['base_apt-get_update'] }
 
   package { 'unzip': ensure => latest, require => Exec['base_apt-get_update'] }
+
+  package { 'htop': ensure => latest, require => Exec['base_apt-get_update'] }
+
+  package { 'inetutils-ping': ensure => latest, require => Exec['base_apt-get_update'] }
+
+  package { 'netcat': ensure => latest, require => Exec['base_apt-get_update'] }
 
   package { 'openjdk-7-jre-headless': ensure => latest, require => Exec['base_apt-get_update'] }
 

puppet/modules/piwik/manifests/db.pp

@@ -9,7 +9,6 @@
 # $root_password::  A password for the MySQL root user
 # $username::       If defined, a MySQL user with this name will be created 
 # $password::       The MySQL user's password
-# $ipaddress::      IP address MySQL should listen to
 # 
 # == Requires: 
 # 
@@ -20,42 +19,57 @@
 #  class {'piwik::db':
 #    root_password => '123456',
 #    username => 'piwik',
-#    password => 'piwik',
-#    ipadress => '127.0.0.1',
+#    password => 'piwik'
 #  }
 #
 class piwik::db(
   $username      = $piwik::params::db_user,
   $password      = $piwik::params::db_password,
   $root_password = $piwik::params::db_password,
-  $ipaddress     = $ipaddress_eth1
 ) {
 
-  class { 'mysql': }
+  if $ipaddress_eth1 {
+      $ipaddress = $ipaddress_eth1
+  } elsif $ipaddress_eth0 {
+      $ipaddress = $ipaddress_eth0
+  } else {
+      $ipaddress = "127.0.0.1"
+  }
+
+  $override_options = {
+    'mysqld' => {
+      'bind_address' => $ipaddress,
+    }
+  }
 
-  class { 'mysql::server':
-    config_hash => { 'root_password' => $root_password, 'bind_address' => $ipaddress }
+  class { '::mysql::server':
+    root_password    => $root_password,
+    override_options => $override_options
   }
 
-  database_user { 'root@%':
+  mysql_user { 'root@%':
    password_hash => mysql_password($root_password),
   }
 
-  database_grant { 'root@%':
+  mysql_grant { 'root@%':
    privileges => ['all'] ,
+   table      => '*.*',
+    user => $username,
   }
 
-  database_user { $username:
+  mysql_user { $username:
     ensure        => present,
     password_hash => mysql_password($password),
     provider      => 'mysql',
     require       => Class['mysql::server'],
   }
 
-  database_grant { $username:
+  mysql_grant { "${username}*/*":
     privileges => ['all'],
     provider   => 'mysql',
-    require    => Database_user[$username],
+    require    => Mysql_user[$username],
+    table      => '*.*',
+    user => $username,
   }
 
   include mysql::server::mysqltuner