From: Stephen Gran Date: Wed, 26 Jan 2011 07:35:49 +0000 (+0000) Subject: move more files X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=10798926214f5796ff758ff8a84c01b19647e598;hp=-c;p=mirror%2Fdsa-puppet.git move more files Signed-off-by: Stephen Gran --- 10798926214f5796ff758ff8a84c01b19647e598 diff --git a/files/etc/apt/apt.conf.d/local-pdiffs b/files/etc/apt/apt.conf.d/local-pdiffs deleted file mode 100644 index 155daf9be..000000000 --- a/files/etc/apt/apt.conf.d/local-pdiffs +++ /dev/null @@ -1,6 +0,0 @@ -// -// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -// - -Acquire::PDiffs "false"; diff --git a/files/etc/apt/apt.conf.d/local-recommends b/files/etc/apt/apt.conf.d/local-recommends deleted file mode 100644 index aa0261cc9..000000000 --- a/files/etc/apt/apt.conf.d/local-recommends +++ /dev/null @@ -1,6 +0,0 @@ -// -// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -// - -APT::Install-Recommends 0; diff --git a/files/etc/cron.d/dsa-puppet-stuff b/files/etc/cron.d/dsa-puppet-stuff deleted file mode 100644 index 5bbf6c443..000000000 --- a/files/etc/cron.d/dsa-puppet-stuff +++ /dev/null @@ -1,3 +0,0 @@ -SHELL=/bin/bash -@hourly root [ ! -d /var/cache/dsa ] || touch /var/cache/dsa/cron.alive -34 */4 * * * root if [ -x /usr/sbin/puppetd ]; then sleep $(( $RANDOM \% 3600 )); if [ -x /usr/bin/timeout ]; then TO="timeout 3600"; else TO=""; fi; $TO /usr/sbin/puppetd --factsync -o --no-daemonize 2>&1 | grep -v 'v6: error fetching interface information: Device not found' ; fi diff --git a/files/etc/default/puppet b/files/etc/default/puppet deleted file mode 100644 index dc0743f26..000000000 --- a/files/etc/default/puppet +++ /dev/null @@ -1,13 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -# Defaults for puppet - sourced by /etc/init.d/puppet - -# Start puppet on boot? -START=no -exit 0 - -# Startup options -DAEMON_OPTS="-w 5 --factsync" diff --git a/files/etc/pam.d/common-session b/files/etc/pam.d/common-session deleted file mode 100644 index 9ae437323..000000000 --- a/files/etc/pam.d/common-session +++ /dev/null @@ -1,15 +0,0 @@ -## -## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -## - -# -# /etc/pam.d/common-session - session-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define tasks to be performed -# at the start and end of sessions of *any* kind (both interactive and -# non-interactive). The default is pam_unix. -# -session required pam_unix.so -session optional pam_mkhomedir.so skel=/etc/skel umask=0022 diff --git a/modules/debian-org/files/apt.conf.d/local-pdiffs b/modules/debian-org/files/apt.conf.d/local-pdiffs new file mode 100644 index 000000000..155daf9be --- /dev/null +++ b/modules/debian-org/files/apt.conf.d/local-pdiffs @@ -0,0 +1,6 @@ +// +// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. +// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git +// + +Acquire::PDiffs "false"; diff --git a/modules/debian-org/files/apt.conf.d/local-recommends b/modules/debian-org/files/apt.conf.d/local-recommends new file mode 100644 index 000000000..aa0261cc9 --- /dev/null +++ b/modules/debian-org/files/apt.conf.d/local-recommends @@ -0,0 +1,6 @@ +// +// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. +// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git +// + +APT::Install-Recommends 0; diff --git a/modules/debian-org/files/dsa-puppet-stuff.cron b/modules/debian-org/files/dsa-puppet-stuff.cron new file mode 100644 index 000000000..5bbf6c443 --- /dev/null +++ b/modules/debian-org/files/dsa-puppet-stuff.cron @@ -0,0 +1,3 @@ +SHELL=/bin/bash +@hourly root [ ! -d /var/cache/dsa ] || touch /var/cache/dsa/cron.alive +34 */4 * * * root if [ -x /usr/sbin/puppetd ]; then sleep $(( $RANDOM \% 3600 )); if [ -x /usr/bin/timeout ]; then TO="timeout 3600"; else TO=""; fi; $TO /usr/sbin/puppetd --factsync -o --no-daemonize 2>&1 | grep -v 'v6: error fetching interface information: Device not found' ; fi diff --git a/modules/debian-org/files/pam.common-session b/modules/debian-org/files/pam.common-session new file mode 100644 index 000000000..9ae437323 --- /dev/null +++ b/modules/debian-org/files/pam.common-session @@ -0,0 +1,15 @@ +## +## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. +## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git +## + +# +# /etc/pam.d/common-session - session-related modules common to all services +# +# This file is included from other service-specific PAM config files, +# and should contain a list of modules that define tasks to be performed +# at the start and end of sessions of *any* kind (both interactive and +# non-interactive). The default is pam_unix. +# +session required pam_unix.so +session optional pam_mkhomedir.so skel=/etc/skel umask=0022 diff --git a/modules/debian-org/files/puppet.default b/modules/debian-org/files/puppet.default new file mode 100644 index 000000000..dc0743f26 --- /dev/null +++ b/modules/debian-org/files/puppet.default @@ -0,0 +1,13 @@ +## +## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. +## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git +## + +# Defaults for puppet - sourced by /etc/init.d/puppet + +# Start puppet on boot? +START=no +exit 0 + +# Startup options +DAEMON_OPTS="-w 5 --factsync" 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,