diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 16:06:32 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 16:06:32 -0200 |
| commit | 86d03609aa0e8cafdce86a0e3d5734518cbf8071 (patch) | |
| tree | 8dfcbae747f9dc8e4479f59123c82ef70210eed5 /manifests | |
| parent | 01043b1dd2e7f6931a7dd031abf12abd988fa6cb (diff) | |
| download | puppet-nodo-86d03609aa0e8cafdce86a0e3d5734518cbf8071.tar.gz puppet-nodo-86d03609aa0e8cafdce86a0e3d5734518cbf8071.tar.bz2 | |
Updating mysql module
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/master.pp | 3 | ||||
| -rw-r--r-- | manifests/subsystems/database.pp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/manifests/master.pp b/manifests/master.pp index 715487d..df1f7d9 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -41,9 +41,6 @@ class nodo::master { ensure => absent, } - # For storeconfigs - include mysql::server - case $master_db_password { '': { fail("Please set nodo::master::db_password in your config") } } diff --git a/manifests/subsystems/database.pp b/manifests/subsystems/database.pp index 5df9700..7cc7a29 100644 --- a/manifests/subsystems/database.pp +++ b/manifests/subsystems/database.pp @@ -1,5 +1,5 @@ class database { - include mysql::server + class { 'mysql::server': } # See http://www.smilecouple.org/2011/03/01/fix-out-of-resource-problem-with-mysql file { '/etc/security/limits.d/mysql.conf': |