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
Show stats 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"],
}

2
apt/manifests/init.pp
View file

@ -67,7 +67,7 @@ class apt::cacher {
file { "/etc/apt-cacher/apt-cacher.conf":
ensure => present,
source => [ "puppet:///files/apt/apt-cacher.conf",
"puppet:///apt/apt-cacher.conf", ],
"puppet:///modules/apt/apt-cacher.conf", ],
mode => 0644,
owner => root,
group => root,

2
autofs/manifests/init.pp
View file

@ -16,7 +16,7 @@ class autofs {
ensure => present,
source => [ "puppet:///files/autofs/auto.master.${fqdn}",
"puppet:///files/autofs/auto.master",
"puppet:///autofs/auto.master", ],
"puppet:///modules/autofs/auto.master", ],
mode => 0644,
owner => root,
group => root,

2
avahi/manifests/init.pp
View file

@ -32,7 +32,7 @@ class avahi::daemon {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
mode => 0755,
owner => root,
group => $operatingsystem ? {

6
backuppc/manifests/init.pp
View file

@ -21,7 +21,7 @@ define backuppc::manualclient($ensure = "present", $operatingsystem = "default")
source => [ "puppet:///files/backuppc/${name}.pl",
"puppet:///files/backuppc/${operatingsystem}.pl",
"puppet:///files/backuppc/default.pl",
"puppet:///backuppc/default.pl", ],
"puppet:///modules/backuppc/default.pl", ],
mode => 0640,
owner => root,
group => backuppc,
@ -105,7 +105,7 @@ class backuppc::server {
file { "/etc/BackupPC/hosts.in":
ensure => present,
source => [ "puppet:///files/backuppc/hosts.in",
"puppet:///backuppc/hosts.in", ],
"puppet:///modules/backuppc/hosts.in", ],
mode => 0644,
owner => root,
group => backuppc,
@ -123,7 +123,7 @@ class backuppc::server {
owner => root,
group => backuppc,
seltype => "httpd_sys_script_rw_t",
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
require => Package["BackupPC"],
notify => Exec["generate-backuppc-hosts"],
}

2
clarified/manifests/init.pp
View file

@ -76,7 +76,7 @@ class clarified::recorder inherits clarified {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
}
file { "/usr/local/src/probe-linux-i686.sh":

10
cups/manifests/init.pp
View file

@ -45,7 +45,7 @@ class cups::server inherits cups::client {
ensure => present,
source => [ "puppet:///files/cups/cupsd.conf.${fqdn}",
"puppet:///files/cups/cupsd.conf",
"puppet:///cups/cupsd.conf", ],
"puppet:///modules/cups/cupsd.conf", ],
mode => 0640,
owner => root,
group => lp,
@ -132,7 +132,7 @@ define cups::printer($uri, $ensure = present) {
file { "/etc/cups/ppd/${name}.ppd":
ensure => $ensure,
source => [ "puppet:///files/cups/${name}.ppd",
"puppet:///cups/postscript.ppd" ],
"puppet:///modules/cups/postscript.ppd" ],
mode => 0644,
owner => root,
group => root,
@ -185,7 +185,7 @@ class cups::samba {
define driverfile() {
file { "/usr/share/cups/drivers/${name}":
ensure => present,
source => "puppet:///cups/drivers/${name}",
source => "puppet:///modules/cups/drivers/${name}",
mode => 0644,
owner => root,
group => root,
@ -216,7 +216,7 @@ class cups::samba {
file { "/etc/cron.hourly/update-printer-inf.sh":
ensure => present,
source => "puppet:///cups/update-printer-inf.sh",
source => "puppet:///modules/cups/update-printer-inf.sh",
mode => 0755,
owner => root,
group => root,
@ -235,7 +235,7 @@ class cups::snmp {
file { "/etc/cron.hourly/printer-details.py":
ensure => present,
source => "puppet:///cups/printer-details.py",
source => "puppet:///modules/cups/printer-details.py",
mode => 0755,
owner => root,
group => root,

2
dhcp/manifests/init.pp
View file

@ -86,7 +86,7 @@ class dhcp::server::ldap inherits dhcp::server::common {
file { "/usr/local/sbin/dhcpdump.py":
ensure => present,
source => "puppet:///dhcp/dhcpdump.py",
source => "puppet:///modules/dhcp/dhcpdump.py",
mode => 0755,
owner => root,
group => $operatingsystem ? {

4
func/manifests/init.pp
View file

@ -8,7 +8,7 @@ class func::minion {
file { "/etc/func/minion.conf":
ensure => present,
source => [ "puppet:///files/func/minion.conf",
"puppet:///func/minion.conf", ],
"puppet:///modules/func/minion.conf", ],
mode => 0644,
owner => root,
group => root,
@ -88,7 +88,7 @@ class func::server inherits func::minion {
file { "/etc/certmaster/certmaster.conf":
ensure => present,
source => [ "puppet:///files/func/certmaster.conf",
"puppet:///func/certmaster.conf", ],
"puppet:///modules/func/certmaster.conf", ],
mode => 0644,
owner => root,
group => root,

2
git/manifests/init.pp
View file

@ -76,7 +76,7 @@ class git::gitweb inherits git::server {
ensure => present,
source => [ "puppet:///files/git/gitweb_config.perl.${fqdn}",
"puppet:///files/git/gitweb_config.perl",
"puppet:///git/gitweb_config.perl", ],
"puppet:///modules/git/gitweb_config.perl", ],
mode => 0644,
owner => root,
group => root,

2
iscsi/manifests/init.pp
View file

@ -17,7 +17,7 @@ class iscsi::server {
ensure => present,
source => [ "puppet:///files/iscsi/targets.conf.${fqdn}",
"puppet:///files/iscsi/targets.conf",
"puppet:///iscsi/targets.conf", ],
"puppet:///modules/iscsi/targets.conf", ],
mode => 0600,
owner => root,
group => root,

4
ldap/manifests/init.pp
View file

@ -228,7 +228,7 @@ class ldap::server {
ensure => present,
source => [ "puppet:///files/ldap/DB_CONFIG.${fqdn}",
"puppet:///files/ldap/DB_CONFIG",
"puppet:///ldap/DB_CONFIG", ],
"puppet:///modules/ldap/DB_CONFIG", ],
mode => 0644,
owner => root,
group => root,
@ -265,7 +265,7 @@ define ldap::server::schema() {
file { "/etc/openldap/schema/${name}.schema":
ensure => present,
source => [ "puppet:///files/ldap/${name}.schema",
"puppet:///ldap/${name}.schema", ],
"puppet:///modules/ldap/${name}.schema", ],
mode => 0644,
owner => root,
group => root,

10
munin/manifests/init.pp
View file

@ -116,7 +116,7 @@ define munin::plugin($config = "") {
OpenBSD: {
file { "/usr/local/libexec/munin/plugins/${name}":
ensure => present,
source => "puppet:///munin/plugins/${name}",
source => "puppet:///modules/munin/plugins/${name}",
owner => root,
group => wheel,
mode => 0755,
@ -126,7 +126,7 @@ define munin::plugin($config = "") {
default: {
file { "/usr/share/munin/plugins/${name}":
ensure => present,
source => "puppet:///munin/plugins/${name}",
source => "puppet:///modules/munin/plugins/${name}",
owner => root,
group => root,
mode => 0755,
@ -140,7 +140,7 @@ define munin::plugin($config = "") {
ensure => present,
source => [ "puppet:///files/munin/plugin-conf/${config}.${fqdn}",
"puppet:///files/munin/plugin-conf/${config}",
"puppet:///munin/plugin-conf/${config}", ],
"puppet:///modules/munin/plugin-conf/${config}", ],
owner => root,
group => $operatingsystem ? {
OpenBSD => wheel,
@ -237,14 +237,14 @@ class munin::server {
owner => root,
group => root,
mode => 0644,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
require => Package["munin"],
}
file { "/etc/munin/munin.conf.in":
ensure => present,
source => [ "puppet:///files/munin/munin.conf.in",
"puppet:///munin/munin.conf.in", ],
"puppet:///modules/munin/munin.conf.in", ],
owner => root,
group => root,
mode => 0644,

6
mysql/manifests/init.pp
View file

@ -72,7 +72,7 @@ class mysql::server {
ensure => present,
source => [ "puppet:///files/mysql/my.cnf.${hostname}",
"puppet:///files/mysql/my.cnf",
"puppet:///mysql/my.cnf", ],
"puppet:///modules/mysql/my.cnf", ],
mode => 0644,
owner => root,
group => root,
@ -82,7 +82,7 @@ class mysql::server {
file { "/etc/logrotate.d/mysql":
ensure => present,
source => "puppet:///mysql/mysql.logrotate",
source => "puppet:///modules/mysql/mysql.logrotate",
mode => 0644,
owner => root,
group => root,
@ -159,7 +159,7 @@ class mysql::server::report {
file { "/etc/cron.daily/mysql-report":
ensure => present,
source => "puppet:///mysql/mysql-report.cron",
source => "puppet:///modules/mysql/mysql-report.cron",
mode => 0755,
owner => root,
group => root,

8
mythtv/manifests/init.pp
View file

@ -63,7 +63,7 @@ class mythtv::backend {
file { "/etc/sysconfig/mythbackend":
ensure => present,
source => "puppet:///mythtv/mythbackend",
source => "puppet:///modules/mythtv/mythbackend",
mode => 0644,
owner => root,
group => root,
@ -86,7 +86,7 @@ class mythtv::backend {
file { "/etc/cron.daily/mythorphans":
ensure => present,
source => "puppet:///mythtv/mythorphans",
source => "puppet:///modules/mythtv/mythorphans",
mode => 0755,
owner => root,
group => root,
@ -107,7 +107,7 @@ class mythtv::cron inherits mythtv::backend {
file { "/etc/cron.daily/mythfilldatabase":
ensure => present,
source => "puppet:///mythtv/mythfilldatabase",
source => "puppet:///modules/mythtv/mythfilldatabase",
mode => 0755,
owner => root,
group => root,
@ -115,7 +115,7 @@ class mythtv::cron inherits mythtv::backend {
file { "/etc/cron.daily/mythoptimize":
ensure => present,
source => "puppet:///mythtv/mythoptimize",
source => "puppet:///modules/mythtv/mythoptimize",
mode => 0755,
owner => root,
group => root,

4
network/manifests/init.pp
View file

@ -40,7 +40,7 @@ class network::helper::debian {
mode => 0644,
owner => root,
group => root,
source => "puppet:///network/interfaces.in",
source => "puppet:///modules/network/interfaces.in",
}
file { "/etc/network/interfaces.d":
@ -51,7 +51,7 @@ class network::helper::debian {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
}
}

4
nfs/manifests/init.pp
View file

@ -26,7 +26,7 @@ class nfs::server inherits nfs::client {
file { "/etc/exports":
ensure => present,
source => [ "puppet:///files/nfs/exports.${fqdn}",
"puppet:///nfs/exports", ],
"puppet:///modules/nfs/exports", ],
mode => 0644,
owner => root,
group => root,
@ -36,7 +36,7 @@ class nfs::server inherits nfs::client {
file { "/etc/sysconfig/nfs":
ensure => present,
source => "puppet:///nfs/nfs.sysconfig",
source => "puppet:///modules/nfs/nfs.sysconfig",
mode => 0644,
owner => root,
group => root,

4
pulseaudio/manifests/init.pp
View file

@ -20,14 +20,14 @@ class pulseaudio::server inherits pulseaudio::common {
file { "/etc/init.d/pulseaudio":
ensure => present,
source => "puppet:///pulseaudio/pulseaudio.init",
source => "puppet:///modules/pulseaudio/pulseaudio.init",
mode => 0755,
owner => root,
group => root,
}
file { "/etc/sysconfig/pulseaudio":
ensure => present,
source => "puppet:///pulseaudio/pulseaudio.sysconfig.${operatingsystem}",
source => "puppet:///modules/pulseaudio/pulseaudio.sysconfig.${operatingsystem}",
mode => 0644,
owner => root,
group => root,

10
puppet/manifests/init.pp
View file

@ -66,7 +66,7 @@ class puppet::client {
}
file { "/etc/default/puppet":
ensure => present,
source => "puppet:///puppet/puppet.enabled.default",
source => "puppet:///modules/puppet/puppet.enabled.default",
mode => 0644,
owner => root,
group => root,
@ -85,7 +85,7 @@ class puppet::client {
file { "/usr/local/sbin/puppet-check":
ensure => present,
source => "puppet:///puppet/puppet-check",
source => "puppet:///modules/puppet/puppet-check",
mode => 0755,
owner => root,
group => $operatingsystem ? {
@ -121,7 +121,7 @@ class puppet::manual inherits puppet::client {
case $operatingsystem {
debian,ubuntu: {
File["/etc/default/puppet"] {
source => "puppet:///puppet/puppet.disabled.default",
source => "puppet:///modules/puppet/puppet.disabled.default",
}
}
}
@ -300,7 +300,7 @@ class puppet::server inherits puppet::client {
ensure => present,
source => [ "puppet:///files/puppet/tagmail.conf.${fqdn}",
"puppet:///files/puppet/tagmail.conf",
"puppet:///puppet/tagmail.conf", ],
"puppet:///modules/puppet/tagmail.conf", ],
mode => 0644,
owner => root,
group => root,
@ -311,7 +311,7 @@ class puppet::server inherits puppet::client {
ensure => present,
source => [ "puppet:///files/puppet/fileserver.conf.${fqdn}",
"puppet:///files/puppet/fileserver.conf",
"puppet:///puppet/fileserver.conf", ],
"puppet:///modules/puppet/fileserver.conf", ],
mode => 0644,
owner => root,
group => root,

4
samba/manifests/init.pp
View file

@ -64,7 +64,7 @@ class samba::server {
ensure => present,
source => [ "puppet:///files/samba/lmhosts.${fqdn}",
"puppet:///files/samba/lmhosts",
"puppet:///samba/lmhosts", ],
"puppet:///modules/samba/lmhosts", ],
mode => 0644,
owner => root,
group => $operatingsystem ? {
@ -85,7 +85,7 @@ class samba::bdc {
file { "/etc/cron.hourly/sync-netlogon.sh":
ensure => present,
source => "puppet:///samba/sync-netlogon.sh",
source => "puppet:///modules/samba/sync-netlogon.sh",
mode => 0755,
owner => root,
group => root,

2
saslauthd/manifests/init.pp
View file

@ -52,7 +52,7 @@ define saslauthd::service() {
source => [ "puppet:///files/saslauthd/${name}.${fqdn}.conf",
"puppet:///files/saslauthd/${name}.conf",
"puppet:///files/saslauthd/service.conf",
"puppet:///saslauthd/service.conf", ],
"puppet:///modules/saslauthd/service.conf", ],
mode => 0644,
owner => root,
group => root,

2
ssh/manifests/init.pp
View file

@ -113,7 +113,7 @@ class ssh::disable {
mode => 0644,
owner => root,
group => root,
source => "puppet:///ssh/ssh.disabled.conf",
source => "puppet:///modules/ssh/ssh.disabled.conf",
}
}
}

4
sudo/manifests/init.pp
View file

@ -14,7 +14,7 @@ class sudo {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
source => "puppet:///modules/custom/empty",
require => Package["sudo"],
}
@ -23,7 +23,7 @@ class sudo {
mode => 0440,
owner => root,
group => root,
source => "puppet:///sudo/sudoers",
source => "puppet:///modules/sudo/sudoers",
require => File["/etc/sudoers.d"],
}

8
vmware/manifests/server.pp
View file

@ -25,7 +25,7 @@ class vmware::server {
}
file { "/usr/lib/vmware/lib/libc.so.6/libc.so.6":
ensure => present,
source => "puppet:///vmware/libc.so.6",
source => "puppet:///modules/vmware/libc.so.6",
mode => 0755,
owner => root,
group => root,
@ -34,7 +34,7 @@ class vmware::server {
}
file { "/usr/local/src/vmware-hostd.patch":
ensure => present,
source => "puppet:///vmware/vmware-hostd.patch",
source => "puppet:///modules/vmware/vmware-hostd.patch",
mode => 0644,
owner => root,
group => root,
@ -107,7 +107,7 @@ class vmware::server::scripts {
define vmware::server::scripts::file {
file { "/usr/local/sbin/${name}":
ensure => present,
source => "puppet:///vmware/scripts/${name}",
source => "puppet:///modules/vmware/scripts/${name}",
mode => 0755,
owner => root,
group => root,
@ -116,7 +116,7 @@ class vmware::server::scripts {
file { "/usr/local/lib/vmware.sh":
ensure => present,
source => "puppet:///vmware/scripts/vmware.sh",
source => "puppet:///modules/vmware/scripts/vmware.sh",
mode => 0644,
owner => root,
group => root,

2
wiki/manifests/init.pp
View file

@ -217,7 +217,7 @@ class wiki::collab::base {
mode => 0660,
owner => collab,
group => collab,
source => "puppet:///wiki/htaccess",
source => "puppet:///modules/wiki/htaccess",
replace => false,
require => File["/srv/wikis/collab/htdocs"],
}

2
yum/manifests/init.pp
View file

@ -11,7 +11,7 @@ class yum::updatesd {
ensure => present,
source => [ "puppet:///files/yum/yum-updatesd.conf.${fqdn}",
"puppet:///files/yum/yum-updatesd.conf",
"puppet:///yum/yum-updatesd.conf", ],
"puppet:///modules/yum/yum-updatesd.conf", ],
mode => 0644,
owner => root,
group => root,