From 10798926214f5796ff758ff8a84c01b19647e598 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 26 Jan 2011 07:35:49 +0000 Subject: [PATCH] move more files Signed-off-by: Stephen Gran --- .../debian-org/files}/apt.conf.d/local-pdiffs | 0 .../debian-org/files}/apt.conf.d/local-recommends | 0 .../debian-org/files/dsa-puppet-stuff.cron | 0 .../debian-org/files/pam.common-session | 0 .../puppet => modules/debian-org/files/puppet.default | 0 modules/debian-org/manifests/init.pp | 10 +++++----- 6 files changed, 5 insertions(+), 5 deletions(-) rename {files/etc/apt => modules/debian-org/files}/apt.conf.d/local-pdiffs (100%) rename {files/etc/apt => modules/debian-org/files}/apt.conf.d/local-recommends (100%) rename files/etc/cron.d/dsa-puppet-stuff => modules/debian-org/files/dsa-puppet-stuff.cron (100%) rename files/etc/pam.d/common-session => modules/debian-org/files/pam.common-session (100%) rename files/etc/default/puppet => modules/debian-org/files/puppet.default (100%) diff --git a/files/etc/apt/apt.conf.d/local-pdiffs b/modules/debian-org/files/apt.conf.d/local-pdiffs similarity index 100% rename from files/etc/apt/apt.conf.d/local-pdiffs rename to modules/debian-org/files/apt.conf.d/local-pdiffs diff --git a/files/etc/apt/apt.conf.d/local-recommends b/modules/debian-org/files/apt.conf.d/local-recommends similarity index 100% rename from files/etc/apt/apt.conf.d/local-recommends rename to modules/debian-org/files/apt.conf.d/local-recommends diff --git a/files/etc/cron.d/dsa-puppet-stuff b/modules/debian-org/files/dsa-puppet-stuff.cron similarity index 100% rename from files/etc/cron.d/dsa-puppet-stuff rename to modules/debian-org/files/dsa-puppet-stuff.cron diff --git a/files/etc/pam.d/common-session b/modules/debian-org/files/pam.common-session similarity index 100% rename from files/etc/pam.d/common-session rename to modules/debian-org/files/pam.common-session diff --git a/files/etc/default/puppet b/modules/debian-org/files/puppet.default similarity index 100% rename from files/etc/default/puppet rename to modules/debian-org/files/puppet.default diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 34dc33e00..34415ecf6 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -64,9 +64,9 @@ class debian-org { content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"), notify => Exec["apt-get update"]; "/etc/apt/apt.conf.d/local-recommends": - source => "puppet:///files/etc/apt/apt.conf.d/local-recommends"; + source => "puppet:///modules/debian-org/apt.conf.d/local-recommends"; "/etc/apt/apt.conf.d/local-pdiffs": - source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs"; + source => "puppet:///modules/debian-org/apt.conf.d/local-pdiffs"; "/etc/timezone": source => "puppet:///files/etc/timezone", notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"]; @@ -76,11 +76,11 @@ class debian-org { ; "/etc/default/puppet": # require => Package["puppet"], - source => "puppet:///files/etc/default/puppet" + source => "puppet:///modules/debian-org/puppet.default" ; "/etc/cron.d/dsa-puppet-stuff": - source => "puppet:///files/etc/cron.d/dsa-puppet-stuff", + source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron", require => Package["cron"] ; "/etc/ldap/ldap.conf": @@ -89,7 +89,7 @@ class debian-org { ; "/etc/pam.d/common-session": require => Package["libpam-pwdfile"], - source => "puppet:///files/etc/pam.d/common-session", + source => "puppet:///modules/debian-org/pam.common-session", ; "/etc/rc.local": mode => 0755, -- 2.20.1