diff options
| author | Micah Anderson <micah@riseup.net> | 2010-09-22 19:38:17 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-09-22 19:38:17 -0400 |
| commit | 892a2c5f631c0003fff6fe3f560a0bb319f51d2a (patch) | |
| tree | e2369667bcc8df3ed56f81c645a474c7fcc8d0ff | |
| parent | 7b1d2925b9a462a699c9c5ce1028b37d0a799b2f (diff) | |
fixing merge error which removed a /
| -rw-r--r-- | manifests/server/base.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/server/base.pp b/manifests/server/base.pp index 4c1e464..ffa0801 100644 --- a/manifests/server/base.pp +++ b/manifests/server/base.pp @@ -6,12 +6,12 @@ class mysql::server::base { path => '/etc/mysql/my.cnf', source => [ "puppet://modules/site-mysql/${fqdn}/my.cnf", - "puppet://modules/site-mysql/my.cnf.${operatingsystem}.{lsbdistcodename}", - "puppet://modules/site-mysql/my.cnf.${operatingsystem}", - "puppet://modules/site-mysql/my.cnf", - "puppet://modules/mysql/config/my.cnf.${operatingsystem}.{lsbdistcodename}", - "puppet://modules/mysql/config/my.cnf.${operatingsystem}", - "puppet://modules/mysql/config/my.cnf" + "puppet:///modules/site-mysql/my.cnf.${operatingsystem}.{lsbdistcodename}", + "puppet:///modules/site-mysql/my.cnf.${operatingsystem}", + "puppet:///modules/site-mysql/my.cnf", + "puppet:///modules/mysql/config/my.cnf.${operatingsystem}.{lsbdistcodename}", + "puppet:///modules/mysql/config/my.cnf.${operatingsystem}", + "puppet:///modules/mysql/config/my.cnf" ], ensure => file, require => Package['mysql-server'], |