rename all $bas_dir variables

git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@123 f03ff2f1-f02d-0410-970d-b9634babeaa1

diff --git a/manifests/init.pp b/manifests/init.pp
index fa8a7e3cbf5341ff8bd02015121c255e12ef58ef..53e2093a26dad0827726f01b026b6dcc23dd25f1 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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],
                        }
                }