provizioning 0.9.18 → 0.9.19

data/lib/provizioning/puppet.rb

@@ -13,6 +13,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :deploy_recipes do
       with_puppet_user do
         run "#{try_sudo} rm -rf #{puppet_path}"
+        run "mkdir -p #{puppet_path}"
         upload File.expand_path("../../../puppet", __FILE__), puppet_path
       end
     end
@@ -44,6 +45,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       deploy_recipes
       with_puppet_user do
         if File.directory?("config/puppet")
+          run "mkdir -p #{puppet_app_modules_path}"
           upload File.expand_path("config/puppet"), puppet_app_modules_path
         end
       end

data/lib/provizioning/version.rb

@@ -1,3 +1,3 @@
 module Provizioning
-  VERSION = "0.9.18"
+  VERSION = "0.9.19"
 end

data/puppet/classes/mysql.pp

@@ -41,6 +41,11 @@ class mysql {
       enable => true
     }
 
+    file {"/etc/mysql/conf.d/character-set.cnf":
+      content => "[mysqld]\ncharacter-set-server=utf8",
+      notify => Service[mysql-server],
+    }
+
     exec { "Initialize MySQL server root password":
       unless      => "/usr/bin/test -f /root/.my.cnf",
       command     => "/usr/bin/mysqladmin -uroot password ${mysql_password}",
@@ -56,14 +61,14 @@ class mysql {
 
     define db( $user, $password ) {
       exec { "create-${name}-db":
-        unless => "/usr/bin/mysql -uroot ${name}",
-        command => "/usr/bin/mysql -uroot -e \"create database ${name};\"",
+        unless => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot ${name}",
+        command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e \"create database ${name};\"",
         require => Service[mysql-server],
       }
 
       exec { "grant-${name}-db":
-        unless => "/usr/bin/mysql -u${user} -p${password} ${name}",
-        command => "/usr/bin/mysql -uroot -e \"grant all on ${name}.* to ${user}@localhost identified by '$password';\"",
+        unless => "/usr/bin/mysql --defaults-file=/root/.my.cnf -u${user} -p${password} ${name}",
+        command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e \"grant all on ${name}.* to ${user}@localhost identified by '$password';\"",
         require => [Service[mysql-server], Exec["create-${name}-db"]]
       }
     }

data/puppet/modules/postgres/manifests/init.pp

@@ -32,7 +32,8 @@ class postgres {
 
     class ubuntu {
   		exec {"get-postgres-apt-key":
-        command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 8683D8A2"
+        command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 8683D8A2",
+        unless => "apt-key list | grep 8683D8A2",
       }
 
   		file {"/etc/apt/sources.list.d/postgres.list":

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: provizioning
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -161,27 +161,6 @@ files:
 - puppet/modules/iptables/manifests/disable.pp
 - puppet/modules/iptables/manifests/init.pp
 - puppet/modules/iptables/manifests/redhat.pp
-- puppet/modules/mysql/Modulefile
-- puppet/modules/mysql/README
-- puppet/modules/mysql/manifests/absent.pp
-- puppet/modules/mysql/manifests/backup.pp
-- puppet/modules/mysql/manifests/backup/example42.pp
-- puppet/modules/mysql/manifests/client.pp
-- puppet/modules/mysql/manifests/conf.pp
-- puppet/modules/mysql/manifests/debug.pp
-- puppet/modules/mysql/manifests/disable.pp
-- puppet/modules/mysql/manifests/disableboot.pp
-- puppet/modules/mysql/manifests/example42.pp
-- puppet/modules/mysql/manifests/firewall.pp
-- puppet/modules/mysql/manifests/grant.pp
-- puppet/modules/mysql/manifests/init.pp
-- puppet/modules/mysql/manifests/monitor.pp
-- puppet/modules/mysql/manifests/monitor/example42.pp
-- puppet/modules/mysql/manifests/params.pp
-- puppet/modules/mysql/manifests/query.pp
-- puppet/modules/mysql/templates/grant.erb
-- puppet/modules/mysql/templates/query.erb
-- puppet/modules/mysql/templates/variables_mysql.erb
 - puppet/modules/network/README
 - puppet/modules/network/manifests/init.pp
 - puppet/modules/nginx/files/init-php-fastcgi

data/puppet/modules/mysql/Modulefile

@@ -1,7 +0,0 @@
-name    'lab42-mysql'
-version '0.1.1'
-
-# dependency 'lab42/common', '>= 0.0.1'
-# dependency 'lab42/monitor', '>= 0.0.1'
-# dependency 'lab42/backup', '>= 0.0.1'
-# dependency 'lab42/firewall', '>= 0.0.1'

data/puppet/modules/mysql/README

@@ -1,56 +0,0 @@
-Puppet module: mysql
-
-# Written by Lab42 #
-# http://www.Example42.com
-
-Licence: GPLv3
-
-DESCRIPTION:
-This module installs and manages mysql.
-Standard and extended classes are available.
-Decide and customize how you want to define configuration files: static files, templates, infile modifications...
-
-
-USER VARIABLES:
-
-
-USAGE:
-# Standard Classes 
-include mysql              # Install and run mysql 
-
-include mysql::disable     # Disable mysql service.
-include mysql::disableboot # Disable mysql service at boot time, but don't stop if it's running.
-include mysql::absent      # Remove mysql package.
-
-# Extended Classes (generally require storeconfigs)
-include mysql::monitor     # Monitor mysql - Automatically included if $monitor=yes - Requires Example42's monitor module
-include mysql::backup      # Backup mysql data - Automatically included if $backup=yes - Requires Example42's backup module
-include mysql::firewall    # Manages firewall rule for mysql service - Automatically included if $firewall=yes - Requires Example42's firewall module
-
-# Generic define to set parameters in the main configuration file. EXPERIMENTAL.
-mysql::conf { "ParameterName": value="YourValue"} # Generic 
-
-# Module specific classes
-
-# Module specific defines
-mysql::grant # Grant permissions 
-mysql::query # Runs arbitrary queries
-
-GENERAL VARIABLES:
-Example42 modules collection uses some general variables that can influence the behaviour of this module.
-You can happily live without considering or setting them, but they can be useful to manage different projects maintanining the module's resuability. 
-$my_project - If set, permits you to alter and customize the module behaviour in custom project classes
-$my_project_onmodule - If set to yes your project classes are looked in a dedicated project module:
-  - $my_project_onmodule not set -> Module autoloads mysql::$my_module (MODULEPATH/mysql/manifests/$my_project.pp)
-  - $my_project_onmodule == yes -> Module autoloads $my_module::mysql (MODULEPATH/$my_project/manifests/mysql.pp)
-$base_source - Let you define an alternative source for static files:
-  - $base_source not set -> Files are looked in puppet://$servername/ (the PuppetMaster)
-  - $base_source set -> Files are looked in $base_source ( could be puppet://$servername/$my_module ) 
-  Note that the module automatically manages the different paths for Puppet pre 0.25
-  
-
-DEPENDENCIES:
-Standard classes generally don't need external modules.
-Extended classes need the relevant external modules (import monitor ; import backup ... ) and the "common" module (import common)
-mysql::conf generic infile configuration define needs the "common" module
-Check on individual module specific classes and defines if there are specific requirements.

data/puppet/modules/mysql/manifests/absent.pp

@@ -1,12 +0,0 @@
-# Class: mysql::absent
-#
-# Removes mysql package
-#
-# Usage:
-# include mysql::absent
-#
-class mysql::absent inherits mysql {
-    Package["mysql"] {
-        ensure => "absent" ,
-    }
-}

data/puppet/modules/mysql/manifests/backup.pp

@@ -1,49 +0,0 @@
-# Class: mysql::backup
-#
-# Backups mysql data and logs using Example42 backup meta module (to be adapted to custom backup solutions)
-# It's automatically included and used if $backup=yes
-# This class permits to abstract what you want to backup from the tool and module to use for backups.
-#
-# Variables:
-# The behaviour of this class has some defaults that can be overriden by user's variables:
-# $mysql_backup_data (true|false) : Set if you want to backup mysql's data. Default: As defined in $backup_data
-# $mysql_backup_log (true|false) : Set if you want to backup mysql's logs. Default: As defined in $backup_log
-# $mysql_backup_frequency (hourly|daily|weekly|monthly) : Set the frequency of your mysql backups. Default: daily.
-# $mysql_backup_target : Define how to reach (Ip, fqdn...) this host to backup mysql from an external server. Default: As defined in $backup_target
-# 
-# You can also set some site wide variables that can be overriden by the above module specific ones:
-# $backup_data (true|false) : Set if you want to enable data backups site-wide. 
-# $backup_log (true|false) : Set if you want to enable logs backups site-wide. 
-# $backup_target : Set the ip/hostname you want to use on an external backup server to backup this host
-# For the defaults of the above variables check mysql::params
-#
-# Usage:
-# Automatically included if $backup=yes
-#
-class mysql::backup {
-
-    include mysql::params
-
-    backup { "mysql_data": 
-        frequency => "${mysql::params::backup_frequency}",
-        path      => "${mysql::params::datadir}",
-        enabled   => "${mysql::params::backup_data_enable}",
-        target    => "${mysql::params::backup_target_real}",
-    }
-    
-    backup { "mysql_logs": 
-        frequency => "${mysql::params::backup_frequency}",
-        path      => "${mysql::params::logdir}",
-        enabled   => "${mysql::params::backup_log_enable}",
-        target    => "${mysql::params::backup_target_real}",
-    }
-
-    # Include project specific backup class if $my_project is set
-    if $my_project { 
-        case $my_project_onmodule {
-            yes,true: { include "${my_project}::mysql::backup" }
-            default: { include "mysql::backup::${my_project}" }
-        }
-    }
-
-}

data/puppet/modules/mysql/manifests/backup/example42.pp

@@ -1,8 +0,0 @@
-# Class mysql::backup::example42
-#
-# Custom backup class for example42 project.
-# Here you can override or define your settings for the backup wrapper
-#
-class mysql::backup::example42 inherits mysql::backup {
-
-}

data/puppet/modules/mysql/manifests/client.pp

@@ -1,18 +0,0 @@
-# Class: mysql::client
-#
-# Manages mysql client installation
-#
-# Usage:
-# include mysql::client 
-#
-class mysql::client {
-
-    include mysql::params
-
-    package { "mysql-client":
-        name   => "${mysql::params::packagename_client}",
-        ensure => present,
-    }
-
-}
-

data/puppet/modules/mysql/manifests/conf.pp

@@ -1,23 +0,0 @@
-# Define mysql::conf
-#
-# General mysql main configuration file's inline modification define
-# Use with caution, it's still at experimental stage and may break in untested circumstances
-# Engine, pattern end line parameters can be tweaked for better behaviour
-#
-# Usage:
-# mysql::conf    { "mynetworks":  value => "127.0.0.0/8 10.42.42.0/24" }
-#
-define mysql::conf ($value) {
-
-    require mysql::params
-
-    config { "mysql_conf_$name":
-        file      => "${mysql::params::configfile}",
-        line      => "$name = $value",
-        pattern   => "^$name ",
-        engine    => "replaceline",
-        notify    => Service["mysql"],
-        require   => File["mysql.conf"],
-    }
-
-}

data/puppet/modules/mysql/manifests/debug.pp

@@ -1,25 +0,0 @@
-#
-# Class: mysql::debug
-#
-# This class is used only for debugging purposes
-#
-# Usage:
-# This class is used if you set $debug=yes
-#
-class mysql::debug {
-
-    # Load the variables used in this module. Check the params.pp file 
-    require mysql::params
-    include puppet::params
-
-    file { "puppet_debug_variables_mysql":
-        path    => "${puppet::params::debugdir}/variables/mysql",
-        mode    => "${mysql::params::configfile_mode}",
-        owner   => "${mysql::params::configfile_owner}",
-        group   => "${mysql::params::configfile_group}",
-        ensure  => present,
-        require => File["puppet_debug_variables"],
-        content => template("mysql/variables_mysql.erb"),
-    }
-
-}

data/puppet/modules/mysql/manifests/disable.pp

@@ -1,13 +0,0 @@
-# Class: mysql::disable
-#
-# Stops mysql service and disables it at boot time
-#
-# Usage:
-# include mysql::disable
-#
-class mysql::disable inherits mysql {
-    Service["mysql"] {
-        ensure => "stopped" ,
-        enable => "false",
-    }
-}

data/puppet/modules/mysql/manifests/disableboot.pp

@@ -1,13 +0,0 @@
-# Class: mysql::disableboot
-#
-# This class disables mysql startup at boot time but doesn't check if the service is running
-# Useful when the service is started but another applications (such as a Cluster suite)
-#
-# Usage:
-# include mysql::disableboot
-#
-class mysql::disableboot inherits mysql {
-    Service["mysql"] {
-        enable => "false",
-    }
-}

data/puppet/modules/mysql/manifests/example42.pp

@@ -1,25 +0,0 @@
-# Class mysql::example42
-#
-# Custom project class for example42 project. Use this to adapt the mysql module to your project.
-# This class is autoloaded if $my_module == example42 and $my_module_onmodule != yes
-# If $my_module_onmodule == yes Puppet tries to autoload example42::mysql
-# that is:  MODULEPATH/example42/manifests/mysql.pp
-#
-# You can use your custom project class to modify the standard behaviour of mysql module
-# If you need to override parameters of resources defined in mysql class use a syntax like
-# class mysql::example42 inherits mysql {
-#     File["mysql.conf"] {
-#         source => [ "puppet:///mysql/mysql.conf-$hostname" , "puppet:///mysql/mysql.conf" ],
-#     }
-#
-# You don't need to use class inheritance if you don't override or redefine resources in mysql class
-#
-# Note that this approach leaves you maximum flexinility on how to manage mysql application in your environment
-# You can add custom resources and decide how to provide the contents of the configuration files:
-# - Via static sourced files ( source => ) according to the naming convention you need
-# - Via custom templates ( content => ) or templates joins
-# - Via some kind on infile line modification tools, such as Augeas or the Example42's conf define approach
-#
-class mysql::example42 {
-
-}

data/puppet/modules/mysql/manifests/firewall.pp

@@ -1,23 +0,0 @@
-# Class: mysql::firewall
-#
-# Manages mysql firewalling using custom Firewall wrapper
-# By default it opens mysql's default port(s) to anybody
-# It's automatically included if $firewall=yes
-#
-# Usage:
-# Automatically included if $firewall=yes 
-#
-class mysql::firewall {
-
-    include mysql::params
-
-    firewall { "mysql_${mysql::params::protocol}_${mysql::params::port}":
-        source      => "${mysql::params::firewall_source_real}",
-        destination => "${mysql::params::firewall_destination_real}",
-        protocol    => "${mysql::params::protocol}",
-        port        => "${mysql::params::port}",
-        action      => "allow",
-        direction   => "input",
-    }
-
-}

data/puppet/modules/mysql/manifests/grant.pp

@@ -1,29 +0,0 @@
-define mysql::grant (
-    $mysql_db,
-    $mysql_user,
-    $mysql_password,
-    $mysql_privileges = "ALL",
-    $mysql_host = "localhost",
-    $mysql_grant_filepath = "/root"
-    ) {
-
-    include mysql
-
-    file {
-        "mysqlgrant-$mysql_user-$mysql_db.sql":
-        mode => 600, owner => root, group => root,
-        ensure => present,
-        path => "$mysql_grant_filepath/mysqlgrant-$mysql_user-$mysql_db.sql",
-        content => template("mysql/grant.erb"),
-        notify => Exec["mysqlgrant-$mysql_user-$mysql_db"],
-    }
-
-    exec {
-        "mysqlgrant-$mysql_user-$mysql_db":
-            command => "mysql < $mysql_grant_filepath/mysqlgrant-$mysql_user-$mysql_db.sql",
-            require => Service["mysql"],
-            unless  => "mysql --user=$mysql_user --password=$mysql_password $mysql_db",
-    }
-
-}
-

data/puppet/modules/mysql/manifests/init.pp

@@ -1,67 +0,0 @@
-#
-# Class: mysql
-#
-# Manages mysql.
-# Include it to install and run mysql
-# It defines package, service, main configuration file.
-#
-# Usage:
-# include mysql
-#
-class mysql {
-
-    # Load the variables used in this module. Check the params.pp file 
-    require mysql::params
-
-    # Basic Package - Service - Configuration file management
-    package { "mysql":
-        name   => "${mysql::params::packagename}",
-        ensure => present,
-    }
-
-    service { "mysql":
-        name       => "${mysql::params::servicename}",
-        ensure     => running,
-        enable     => true,
-        hasrestart => true,
-        hasstatus  => "${mysql::params::hasstatus}",
-        pattern    => "${mysql::params::processname}",
-        require    => Package["mysql"],
-        subscribe  => File["mysql.conf"],
-    }
-
-    file { "mysql.conf":
-        path    => "${mysql::params::configfile}",
-        mode    => "${mysql::params::configfile_mode}",
-        owner   => "${mysql::params::configfile_owner}",
-        group   => "${mysql::params::configfile_group}",
-        ensure  => present,
-        require => Package["mysql"],
-        notify  => Service["mysql"],
-        # content => template("mysql/mysql.conf.erb"),
-    }
-
-    # Include OS specific subclasses, if necessary
-    case $operatingsystem {
-        default: { }
-    }
-
-    # Include extended classes, if 
-    if $backup == "yes" { include mysql::backup }
-    if $monitor == "yes" { include mysql::monitor }
-    if $firewall == "yes" { include mysql::firewall }
-
-    # Include project specific class if $my_project is set
-    # The extra project class is by default looked in mysql module 
-    # If $my_project_onmodule == yes it's looked in your project module
-    if $my_project { 
-        case $my_project_onmodule {
-            yes,true: { include "${my_project}::mysql" }
-            default: { include "mysql::${my_project}" }
-        }
-    }
-
-    # Include debug class is debugging is enabled ($debug=yes)
-    if ( $debug == "yes" ) or ( $debug == true ) { include mysql::debug }
-
-}

data/puppet/modules/mysql/manifests/monitor.pp

@@ -1,77 +0,0 @@
-# Class: mysql::monitor
-#
-# Monitors mysql process/ports/service using Example42 monitor meta module (to be adapted to custom monitor solutions)
-# It's automatically included ad used if $monitor=yes and is defined at least one monitoring software in $monitor_tool
-# This class permits to abstract what you want to monitor from the actual tool and modules you'll use for monitoring
-# and can be used to quickly deploy a new monitoring solution
-#
-# Variables:
-# The behaviour of this class has some defaults that can be overriden by user's variables:
-# $mysql_monitor_port (true|false) : Set if you want to monitor mysql's port(s). If any. Default: As defined in $monitor_port
-# $mysql_monitor_url (true|false) : Set if you want to monitor mysql's url(s). If any. Default: As defined in $monitor_url
-# $mysql_monitor_process (true|false) : Set if you want to monitor mysql's process. If any. Default: As defined in $monitor_process
-# $mysql_monitor_plugin (true|false) : Set if you want to monitor mysql using specific monitor tool's plugin  i   s. If any. Default: As defined in $monitor_plugin
-# $mysql_monitor_target : Define how to reach (Ip, fqdn...) the host to monitor mysql from an external server. Default: As defined in $monitor_target
-# $mysql_monitor_url : Define the baseurl (http://$fqdn/...) to use for eventual mysql URL checks. Default: As defined in $monitor_url
-# 
-# You can therefore set site wide variables that can be overriden by the above module specific ones:
-# $monitor_port (true|false) : Set if you want to enable port monitoring site-wide.
-# $monitor_url (true|false) : Set if you want to enable url checking site-wide.
-# $monitor_process (true|false) : Set if you want to enable process monitoring site-wide.
-# $monitor_plugin (true|false) : Set if you want to try to use specific plugins of your monitoring tools 
-# $monitor_target : Set the ip/hostname you want to use on an external monitoring server to monitor this host
-# $monitor_baseurl : Set baseurl to use for eventual URL checks of services provided by this host
-# For the defaults of the above variables check mysql::params
-#
-# Usage:
-# Automatically included if $monitor=yes
-# Use the variable $monitor_tool (can be an array) to define the monitoring software you want to use.
-# To customize specific and more granular behaviours use the above variables and eventually your custom modulename::monitor::$my_project class
-#
-class mysql::monitor {
-
-    include mysql::params
-
-    # Port monitoring
-    monitor::port { "mysql_${mysql::params::protocol}_${mysql::params::port}": 
-        protocol    => "${mysql::params::protocol}",
-        port        => "${mysql::params::port}",
-        target      => "${mysql::params::monitor_target_real}",
-        enable      => "${mysql::params::monitor_port_enable}",
-        checksource => "local", # When MySql binds to localhost
-        tool        => "${monitor_tool}",
-    }
-    
-    # URL monitoring 
-    monitor::url { "mysql_url":
-        url      => "${mysql::params::monitor_baseurl_real}/index.php",
-        pattern  => "${mysql::params::monitor_url_pattern}",
-        enable   => "${mysql::params::monitor_url_enable}",
-        tool     => "${monitor_tool}",
-    }
-
-    # Process monitoring 
-    monitor::process { "mysql_process":
-        process  => "${mysql::params::processname}",
-        service  => "${mysql::params::servicename}",
-        pidfile  => "${mysql::params::pidfile}",
-        enable   => "${mysql::params::monitor_process_enable}",
-        tool     => "${monitor_tool}",
-    }
-
-    # Use a specific plugin (according to the monitor tool used)
-    monitor::plugin { "mysql_plugin":
-        plugin   => "mysql",
-        enable   => "${mysql::params::monitor_plugin_enable}",
-        tool     => "${monitor_tool}",
-    }
-
-    # Include project specific monitor class if $my_project is set
-    if $my_project { 
-        case $my_project_onmodule {
-            yes,true: { include "${my_project}::mysql::monitor" }
-            default: { include "mysql::monitor::${my_project}" }
-        }
-    }
-
-}

data/puppet/modules/mysql/manifests/monitor/example42.pp

@@ -1,8 +0,0 @@
-# Class mysql::monitor::example42
-#
-# Custom monitor class for example42 project.
-# Here you can override or define your settings for the monitor wrapper
-#
-class mysql::monitor::example42 inherits mysql::monitor {
-
-}

data/puppet/modules/mysql/manifests/params.pp

@@ -1,240 +0,0 @@
-# Class: mysql::params
-#
-# Sets internal variables and defaults for mysql module
-# This class is automatically loaded in all the classes that use the values set here 
-#
-class mysql::params  {
-
-## DEFAULTS FOR VARIABLES USERS CAN SET
-# (Here are set the defaults, provide your custom variables externally)
-# (The default used is in the line with '')
-
-
-
-## MODULE INTERNAL VARIABLES
-# (Modify to adapt to unsupported OSes)
-
-    $packagename = $operatingsystem ? {
-        default => "mysql-server",
-    }
-
-    $packagename_client = $operatingsystem ? {
-        redhat  => "mysql",
-        centos  => "mysql",
-        default => "mysql-client",
-    }
-
-    $servicename = $operatingsystem ? {
-        redhat  => "mysqld",
-        centos  => "mysqld",
-        default => "mysql",
-    }
-
-    $processname = $operatingsystem ? {
-        default => "mysqld",
-    }
-
-    $hasstatus = $operatingsystem ? {
-        debian  => false,
-        ubuntu  => false,
-        default => true,
-    }
-
-    $configfile = $operatingsystem ? {
-        debian  => "/etc/mysql/my.cnf",
-        ubuntu  => "/etc/mysql/my.cnf",
-        default => "/etc/my.cnf",
-    }
-
-    $configfile_mode = $operatingsystem ? {
-        default => "644",
-    }
-
-    $configfile_owner = $operatingsystem ? {
-        default => "root",
-    }
-
-    $configfile_group = $operatingsystem ? {
-        default => "root",
-    }
-
-    $configdir = $operatingsystem ? {
-        default => "/etc/mysql/conf.d",
-    }
-
-    $initconfigfile = $operatingsystem ? {
-        debian  => "/etc/default/mysql",
-        ubuntu  => "/etc/default/mysql",
-        default => "/etc/sysconfig/mysqld",
-    }
-    
-    # Used by monitor class
-    $pidfile = $operatingsystem ? {
-        default  => "/var/run/mysqld/mysqld.pid",
-    }
-
-    # Used by backup class
-    $datadir = $operatingsystem ? {
-        default => "/var/lib/mysql",
-    }
-
-    # Used by backup class - Provide the file name, if there's no dedicated dir
-    $logdir = $operatingsystem ? {
-        default => "/var/log/mysql",
-    }
-
-    # Used by monitor and firewall class
-    # If you need to define additional ports, call them $protocol1/$port1 and add the relevant
-    # parts in firewall.pp and monitor.pp
-    $protocol = "tcp"
-    $port = "3306"
-    
-
-
-## DEFAULTS FOR MONITOR CLASS
-# These are settings that influence the (optional) mysql::monitor class
-# You can define these variables or leave the defaults
-# The apparently complex variables assignements below follow this logic:
-# - If no user variable is set, a reasonable default is used
-# - If the user has set a host-wide variable (ex: $monitor_target ) that one is set
-# - The host-wide variable can be overriden by a module specific one (ex: $mysql_monitor_target)
-
-    # How the monitor server refers to the monitor target 
-    $monitor_target_real = $mysql_monitor_target ? {
-        ''      => $monitor_target ? {
-           ''      => "${fqdn}",
-           default => $monitor_target,
-        },
-        default => "$mysql_monitor_target",
-    }
-
-    # BaseUrl to access this host
-    $monitor_baseurl_real = $mysql_monitor_baseurl ? {
-        ''      => $monitor_baseurl ? {
-           ''      => "http://${fqdn}",
-           default => $monitor_baseurl,
-        },
-        default => "${mysql_monitor_baseurl}",
-    }
-
-    # Pattern to look for in the URL defined in mysql::monitor class
-    $monitor_url_pattern = $mysql_monitor_url_pattern ? {
-        ''      => "OK",
-        default => "${mysql_monitor_url_pattern}",
-    }
-
-    # If mysql port monitoring is enabled 
-    $monitor_port_enable = $mysql_monitor_port ? {
-        ''      => $monitor_port ? {
-           ''      => true,
-           default => $monitor_port,
-        },
-        default => $mysql_monitor_port,
-    }
-
-    # If mysql url monitoring is enabled 
-    $monitor_url_enable = $mysql_monitor_url ? {
-        ''      => $monitor_url ? {
-           ''      => false,
-           default => $monitor_url,
-        },
-        default => $mysql_monitor_url,
-    }
-
-    # If mysql process monitoring is enabled 
-    $monitor_process_enable = $mysql_monitor_process ? {
-        ''      => $monitor_process ? {
-           ''      => true,
-           default => $monitor_process,
-        },
-        default => $mysql_monitor_process,
-    }
-
-    # If mysql plugin monitoring is enabled 
-    $monitor_plugin_enable = $mysql_monitor_plugin ? {
-        ''      => $monitor_plugin ? {
-           ''      => true,
-           default => $monitor_plugin,
-        },
-        default => $mysql_monitor_plugin,
-    }
-
-## DEFAULTS FOR BACKUP CLASS
-# These are settings that influence the (optional) mysql::backup class
-# You can define these variables or leave the defaults
-
-    # How the backup server refers to the backup target 
-    $backup_target_real = $mysql_backup_target ? {
-        ''      => $backup_target ? {
-           ''      => "${fqdn}",
-           default => $backup_target,
-        },
-        default => "$mysql_backup_target",
-    }
-  
-    # Frequency of backups
-    $backup_frequency = $mysql_backup_frequency ? {
-        ''      => "daily",
-        default => "$mysql_backup_frequency",
-    }
-
-    # If mysql data have to be backed up
-    $backup_data_enable = $mysql_backup_data ? {
-        ''      => $backup_data ? {
-           ''      => true,
-           default => $backup_data,
-        },
-        default => $mysql_backup_data,
-    }
-
-    # If mysql logs have to be backed up
-    $backup_log_enable = $mysql_backup_log ? {
-        ''      => $backup_log ? {
-           ''      => true,
-           default => $backup_log,
-        },
-        default => $mysql_backup_log,
-    }
-
-
-## DEFAULTS FOR FIREWALL CLASS
-# These are settings that influence the (optional) mysql::firewall class
-# You can define these variables or leave the defaults
-
-    # Source IPs that can access this service - Use iptables friendly format
-    $firewall_source_real = $mysql_firewall_source ? {
-        ''      => $firewall_source ? {
-           ''      => "0.0.0.0/0",
-           default => $firewall_source,
-        },
-        default => "$mysql_firewall_source",
-    }
-
-    # Destination IP to use for this host (Default facter's $ipaddress)
-    $firewall_destination_real = $mysql_firewall_destination ? {
-        ''      => $firewall_destination ? {
-           ''      => "${ipaddress}",
-           default => $firewall_destination,
-        },
-        default => "$mysql_firewall_destination",
-    }
-
-## FILE SERVING SOURCE
-# Sets the correct source for static files
-# In order to provide files from different sources without modifying the module
-# you can override the default source path setting the variable $base_source
-# Ex: $base_source="puppet://ip.of.fileserver" or $base_source="puppet://$servername/myprojectmodule"
-# What follows automatically manages the new source standard (with /modules/) from 0.25 
-
-    case $base_source {
-        '': {
-            $general_base_source = $puppetversion ? {
-                /(^0.25)/ => "puppet:///modules",
-                /(^0.)/   => "puppet://$servername",
-                default   => "puppet:///modules",
-            }
-        }
-        default: { $general_base_source=$base_source }
-    }
-
-}

data/puppet/modules/mysql/manifests/query.pp

@@ -1,30 +0,0 @@
-define mysql::query (
-    $mysql_db,
-    $mysql_user = "root",
-    $mysql_password = "",
-    $mysql_host = "localhost",
-    $mysql_query,
-    $mysql_query_filepath = "/root"
-    ) {
-
-    file {
-        "mysqlquery-$mysql_user-$mysql_db.sql":
-        mode => 600, owner => root, group => root,
-        ensure => present,
-        path => "$mysql_query_filepath/mysqlquery-$mysql_user-$mysql_db.sql",
-        content => template("mysql/query.erb"),
-        notify => Exec["mysqlquery-$mysql_user-$mysql_db"],
-        require => Service["mysql"],
-    }
-
-    exec {
-        "mysqlquery-$mysql_user-$mysql_db":
-            command => "mysql < $mysql_query_filepath/mysqlquery-$mysql_user-$mysql_db.sql",
-            require => File["mysqlquery-$mysql_user-$mysql_db.sql"],
-            refreshonly => true,
-            subscribe => File["mysqlquery-$mysql_user-$mysql_db.sql"],
-    }
-
-}
-
-

data/puppet/modules/mysql/templates/grant.erb

@@ -1,6 +0,0 @@
-# File managed by Puppet
-
-CREATE DATABASE IF NOT EXISTS <%= mysql_db %> ;
-GRANT <%= mysql_privileges %> ON <%= mysql_db %>.* TO '<%= mysql_user %>'@'<%= mysql_host %>' IDENTIFIED BY '<%= mysql_password %>';
-FLUSH PRIVILEGES ;
-

data/puppet/modules/mysql/templates/query.erb

@@ -1,5 +0,0 @@
-# File managed by Puppet
-
-USE <%= mysql_db %> ;
-<%= mysql_query %> ;
-

data/puppet/modules/mysql/templates/variables_mysql.erb

@@ -1,42 +0,0 @@
-# File Managed By Puppet
-
-These are the variables used by the module mysql
-
-User variables:
-
-General internal variables:
-$packagename = <%= scope.lookupvar('mysql::params::packagename') %>
-$servicename = <%= scope.lookupvar('mysql::params::servicename') %>
-$processname = <%= scope.lookupvar('mysql::params::servicename') %>
-$hasstatus = <%= scope.lookupvar('mysql::params::hasstatus') %>
-$configfile = <%= scope.lookupvar('mysql::params::configfile') %>
-$configfile_mode = <%= scope.lookupvar('mysql::params::configfile_mode') %>
-$configfile_owner = <%= scope.lookupvar('mysql::params::configfile_owner') %>
-$configfile_group = <%= scope.lookupvar('mysql::params::configfile_group') %>
-$configdir = <%= scope.lookupvar('mysql::params::configdir') %>
-$initconfigfile = <%= scope.lookupvar('mysql::params::initconfigfile') %>
-$pidfile = <%= scope.lookupvar('mysql::params::pidfile') %>
-$datadir = <%= scope.lookupvar('mysql::params::datadir') %>
-$logdir = <%= scope.lookupvar('mysql::params::logdir') %>
-$protocol = <%= scope.lookupvar('mysql::params::protocol') %>
-$port = <%= scope.lookupvar('mysql::params::port') %>
-
-Variables used by monitor class:
-$monitor_target_real = <%= scope.lookupvar('mysql::params::monitor_target_real') %>
-$monitor_baseurl_real = <%= scope.lookupvar('mysql::params::monitor_baseurl_real') %>
-$monitor_url_pattern = <%= scope.lookupvar('mysql::params::monitor_url_pattern') %>
-$monitor_port_enable = <%= scope.lookupvar('mysql::params::monitor_port_enable') %>
-$monitor_url_enable = <%= scope.lookupvar('mysql::params::monitor_url_enable') %>
-$monitor_process_enable = <%= scope.lookupvar('mysql::params::monitor_process_enable') %>
-$monitor_plugin_enable = <%= scope.lookupvar('mysql::params::monitor_plugin_enable') %>
-
-Variables used by backup class:
-$backup_target_real = <%= scope.lookupvar('mysql::params::backup_target_real') %>
-$backup_frequency = <%= scope.lookupvar('mysql::params::backup_frequency') %>
-$backup_data_enable = <%= scope.lookupvar('mysql::params::backup_data_enable') %>
-$backup_log_enable = <%= scope.lookupvar('mysql::params::backup_log_enable') %>
-$general_base_source = <%= scope.lookupvar('mysql::params::general_base_source') %>
-
-Variables used by firewall class:
-$firewall_source_real = <%= scope.lookupvar('mysql::params::firewall_source_real') %>
-$firewall_destination_real = <%= scope.lookupvar('mysql::params::firewall_destination_real') %>