From: Stephen Gran Date: Wed, 26 Jan 2011 07:40:23 +0000 (+0000) Subject: move more files X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=3315af53c1e164b8a76ef166183933c754106ba8;hp=-c;p=mirror%2Fdsa-puppet.git move more files Signed-off-by: Stephen Gran --- 3315af53c1e164b8a76ef166183933c754106ba8 diff --git a/files/etc/apt/preferences b/files/etc/apt/preferences deleted file mode 100644 index 5525c2575..000000000 --- a/files/etc/apt/preferences +++ /dev/null @@ -1,27 +0,0 @@ -Explanation: -Explanation: THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. -Explanation: USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git -Explanation: -Package: * -Pin: release o=Debian Backports -Pin-Priority: 200 - -Package: sbuild -Pin: release o=buildd.debian.org -Pin-Priority: 500 - -Package: buildd -Pin: release o=buildd.debian.org -Pin-Priority: 500 - -Package: buildd-builder-meta -Pin: release o=buildd.debian.org -Pin-Priority: 500 - -Package: libsbuild-perl -Pin: release o=buildd.debian.org -Pin-Priority: 500 - -Package: * -Pin: release o=buildd.debian.org -Pin-Priority: -1 diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf deleted file mode 100644 index a4c7ade22..000000000 --- a/files/etc/puppet/puppet.conf +++ /dev/null @@ -1,29 +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 -## - -[main] -logdir=/var/log/puppet -vardir=/var/lib/puppet -ssldir=/var/lib/puppet/ssl -rundir=/var/run/puppet -factpath=$vardir/facts -pluginsync=false -# This is the default environment for all clients -environment=production - -[puppetmasterd] -templatedir=/etc/puppet/templates -libdir=/etc/puppet/lib -environments = development,testing,production,staging - -[puppetd] -environments = development,testing,production,staging - -[staging] -libdir=/etc/puppet/lib -manifestdir=/srv/puppet.debian.org/stages/staging/manifests -templatedir=/srv/puppet.debian.org/stages/staging/templates -fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf -modulepath=/srv/puppet.debian.org/stages/staging/modules diff --git a/files/etc/timezone b/files/etc/timezone deleted file mode 100644 index 7f39493bd..000000000 --- a/files/etc/timezone +++ /dev/null @@ -1 +0,0 @@ -Etc/UTC diff --git a/modules/debian-org/files/apt.preferences b/modules/debian-org/files/apt.preferences new file mode 100644 index 000000000..5525c2575 --- /dev/null +++ b/modules/debian-org/files/apt.preferences @@ -0,0 +1,27 @@ +Explanation: +Explanation: THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. +Explanation: USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git +Explanation: +Package: * +Pin: release o=Debian Backports +Pin-Priority: 200 + +Package: sbuild +Pin: release o=buildd.debian.org +Pin-Priority: 500 + +Package: buildd +Pin: release o=buildd.debian.org +Pin-Priority: 500 + +Package: buildd-builder-meta +Pin: release o=buildd.debian.org +Pin-Priority: 500 + +Package: libsbuild-perl +Pin: release o=buildd.debian.org +Pin-Priority: 500 + +Package: * +Pin: release o=buildd.debian.org +Pin-Priority: -1 diff --git a/modules/debian-org/files/puppet.conf b/modules/debian-org/files/puppet.conf new file mode 100644 index 000000000..a4c7ade22 --- /dev/null +++ b/modules/debian-org/files/puppet.conf @@ -0,0 +1,29 @@ +## +## 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 +## + +[main] +logdir=/var/log/puppet +vardir=/var/lib/puppet +ssldir=/var/lib/puppet/ssl +rundir=/var/run/puppet +factpath=$vardir/facts +pluginsync=false +# This is the default environment for all clients +environment=production + +[puppetmasterd] +templatedir=/etc/puppet/templates +libdir=/etc/puppet/lib +environments = development,testing,production,staging + +[puppetd] +environments = development,testing,production,staging + +[staging] +libdir=/etc/puppet/lib +manifestdir=/srv/puppet.debian.org/stages/staging/manifests +templatedir=/srv/puppet.debian.org/stages/staging/templates +fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf +modulepath=/srv/puppet.debian.org/stages/staging/modules diff --git a/modules/debian-org/files/timezone b/modules/debian-org/files/timezone new file mode 100644 index 000000000..7f39493bd --- /dev/null +++ b/modules/debian-org/files/timezone @@ -0,0 +1 @@ +Etc/UTC diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 34415ecf6..262479a66 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -50,7 +50,7 @@ class debian-org { } file { "/etc/apt/preferences": - source => "puppet:///files/etc/apt/preferences"; + source => "puppet:///modules/debian-org/apt.preferences"; "/etc/apt/sources.list.d/backports.org.list": content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"), notify => Exec["apt-get update"]; @@ -68,11 +68,11 @@ class debian-org { "/etc/apt/apt.conf.d/local-pdiffs": source => "puppet:///modules/debian-org/apt.conf.d/local-pdiffs"; "/etc/timezone": - source => "puppet:///files/etc/timezone", + source => "puppet:///modules/debian-org/timezone", notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"]; "/etc/puppet/puppet.conf": # require => Package["puppet"], - source => "puppet:///files/etc/puppet/puppet.conf" + source => "puppet:///modules/debian-org/puppet.conf" ; "/etc/default/puppet": # require => Package["puppet"],