tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed deprecation warnings "Files found in modules without specifying 'modules' in file path". This will break 0.24.x client compatibility.

Browse source
This commit is contained in:
Timo Mkinen 2011-01-26 20:06:13 +02:00
parent 33be443516
commit 5475229cfd
28 changed files with 65 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apache/manifests/debian.pp
View file

@ -25,7 +25,7 @@ class apache::debian::common {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
}
file { "/etc/apache2/envvars":
@ -151,7 +151,7 @@ define apache::debian::site($aliases, $root, $redirect) {
force => true,
recurse => true,
source => [ "puppet:///files/apache/sites/${site_fqdn}",
"puppet:///custom/empty", ],
"puppet:///modules/custom/empty", ],
before => File["${site_conf}"],
notify => Service["apache2"],
}
@ -276,7 +276,7 @@ define apache::debian::sslsite($root, $ssl_cert, $ssl_key, $ssl_chain) {
force => true,
recurse => true,
source => [ "puppet:///files/apache/sslsites/${site_fqdn}",
"puppet:///custom/empty", ],
"puppet:///modules/custom/empty", ],
before => File["${site_conf}"],
notify => Service["apache2"],
}

6
apache/manifests/init.pp
View file

@ -46,7 +46,7 @@ class apache::common {
file { "/usr/local/sbin/www-logrotate.sh":
ensure => present,
source => "puppet:///apache/www-logrotate.sh",
source => "puppet:///modules/apache/www-logrotate.sh",
mode => 0755,
owner => root,
group => root,
@ -639,7 +639,7 @@ class apache::webalizer {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
}
case $operatingsystem {
@ -659,7 +659,7 @@ class apache::webalizer {
file { "/usr/local/sbin/www-webalizer.sh":
ensure => present,
source => "puppet:///apache/www-webalizer.sh",
source => "puppet:///modules/apache/www-webalizer.sh",
mode => 0755,
owner => root,
group => root,

10
apache/manifests/redhat.pp
View file

@ -25,7 +25,7 @@ class apache::redhat::server {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
}
file { "/etc/httpd/conf/httpd.conf":
@ -111,7 +111,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
force => true,
recurse => true,
source => [ "puppet:///files/apache/sites/${site_fqdn}",
"puppet:///custom/empty", ],
"puppet:///modules/custom/empty", ],
before => File["${site_conf}"],
notify => Service["httpd"],
}
@ -151,7 +151,7 @@ class apache::redhat::sslserver {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
}
file { "/etc/httpd/conf/httpsd.conf":
@ -166,7 +166,7 @@ class apache::redhat::sslserver {
file { "/etc/init.d/httpsd":
ensure => present,
source => "puppet:///apache/httpsd",
source => "puppet:///modules/apache/httpsd",
mode => 0755,
owner => root,
group => root,
@ -291,7 +291,7 @@ define apache::redhat::sslsite($root, $ssl_cert, $ssl_key, $ssl_chain) {
force => true,
recurse => true,
source => [ "puppet:///files/apache/sslsites/${site_fqdn}",
"puppet:///custom/empty", ],
"puppet:///modules/custom/empty", ],
before => File["${site_conf}"],
notify => Service["httpsd"],
}