opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rename all $bas_dir variables

Browse source 
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@123 f03ff2f1-f02d-0410-970d-b9634babeaa1
This commit is contained in:
david 2007-07-14 09:42:37 +00:00
parent 27aebdb066
commit 888a4c1a06
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
manifests/init.pp
View file

@ -41,13 +41,13 @@ class apt {
before => File[apt_config];
}
$base_dir = "/var/lib/puppet/modules/apt"
$apt_base_dir = "/var/lib/puppet/modules/apt"
file {
# remove my legacy files
[ "/etc/apt/backports.key", "/etc/apt/apt.conf.d/local-conf" ]:
ensure => removed;
# create new modules dir
$base_dir: ensure => directory;
$apt_base_dir: ensure => directory;
# watch apt.conf.d
"/etc/apt/apt.conf.d": ensure => directory, checksum => mtime;
}
@ -85,14 +85,14 @@ class apt {
# This key was downloaded from
# http://backports.org/debian/archive.key
# and is needed to bootstrap the backports trustpath
file { "${base_dir}/backports.org.key":
file { "${apt_base_dir}/backports.org.key":
source => "puppet://$servername/apt/backports.org.key",
mode => 0444, owner => root, group => root,
before => File[apt_config],
}
exec { "/usr/bin/apt-key add ${base_dir}/backports.org.key":
exec { "/usr/bin/apt-key add ${apt_base_dir}/backports.org.key":
refreshonly => true,
subscribe => File["${base_dir}/backports.org.key"],
subscribe => File["${apt_base_dir}/backports.org.key"],
before => File[apt_config],
}
}