diff options
Diffstat (limited to 'manifests/server/base.pp')
| -rw-r--r-- | manifests/server/base.pp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/manifests/server/base.pp b/manifests/server/base.pp index 43ce158..b14fa86 100644 --- a/manifests/server/base.pp +++ b/manifests/server/base.pp @@ -5,13 +5,13 @@ class mysql::server::base { file { 'mysql_main_cnf': path => '/etc/mysql/my.cnf', source => [ - "puppet://$server/modules/site-mysql/${fqdn}/my.cnf", - "puppet://$server/modules/site-mysql/my.cnf.${operatingsystem}.{lsbdistcodename}", - "puppet://$server/modules/site-mysql/my.cnf.${operatingsystem}", - "puppet://$server/modules/site-mysql/my.cnf", - "puppet://$server/modules/mysql/config/my.cnf.${operatingsystem}.{lsbdistcodename}", - "puppet://$server/modules/mysql/config/my.cnf.${operatingsystem}", - "puppet://$server/modules/mysql/config/my.cnf" + "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" ], ensure => file, require => Package['mysql-server'], @@ -40,8 +40,8 @@ class mysql::server::base { } file { 'mysql_setmysqlpass.sh': - path => "${mysql_moduledir}/server/setmysqlpass.sh", - source => "puppet://${server}/modules/mysql/scripts/${operatingsystem}/setmysqlpass.sh", + path => '/usr/local/sbin/setmysqlpass.sh', + source => "puppet:///modules/mysql/scripts/${operatingsystem}/setmysqlpass.sh", require => Package['mysql-server'], owner => root, group => 0, mode => 0500; } @@ -55,7 +55,7 @@ class mysql::server::base { } exec { 'mysql_set_rootpw': - command => "${mysql_moduledir}/server/setmysqlpass.sh ${mysql_rootpw}", + command => "/user/local/sbin/setmysqlpass.sh ${mysql_rootpw}", unless => "mysqladmin -uroot status > /dev/null", require => [ File['mysql_setmysqlpass.sh'], Package['mysql-server'] ], refreshonly => true, |