diff options
| author | Micah Anderson <micah@riseup.net> | 2010-12-15 14:49:34 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-12-15 14:49:34 -0500 |
| commit | 5237f9dab0480ed7eb064826c6e92d315dabaddc (patch) | |
| tree | b6a0de2edcf83c824bab365ae25fd12ccd1fb61f | |
| parent | 4625afacaea115cb3ef20ba2b0f277890c480e93 (diff) | |
| download | puppet-apt-5237f9dab0480ed7eb064826c6e92d315dabaddc.tar.gz puppet-apt-5237f9dab0480ed7eb064826c6e92d315dabaddc.tar.bz2 | |
change $listchanges_* to $apt_listchanges, not nice to clutter up the namespace like that
| -rw-r--r-- | manifests/listchanges.pp | 18 | ||||
| -rw-r--r-- | templates/Debian/listchanges_lenny.erb | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp index 347717e..04cbc52 100644 --- a/manifests/listchanges.pp +++ b/manifests/listchanges.pp @@ -1,37 +1,37 @@ class apt::listchanges { - case $listchanges_version { + case $apt_listchanges_version { '': { $listchanges_version = "present" } } - case $listchanges_config { + case $apt_listchanges_config { '': { $listchanges_config = "apt/${operatingsystem}/listchanges_${lsbdistcodename}.erb" } } - case $listchanges_frontend { + case $apt_listchanges_frontend { '': { $listchanges_frontend = "mail" } } - case $listchanges_email { + case $apt_listchanges_email { '': { $listchanges_email = "root" } } - case $listchanges_confirm { + case $apt_listchanges_confirm { '': { $listchanges_confirm = "0" } } - case $listchanges_saveseen { + case $apt_listchanges_saveseen { '': { $listchanges_saveseen = "/var/lib/apt/listchanges.db" } } - case $listchanges_which { + case $apt_listchanges_which { '': { $listchanges_which = "both" } } - package { apt-listchanges: ensure => $listchanges_ensure_version } + package { apt-listchanges: ensure => $apt_listchanges_ensure_version } file { "/etc/apt/listchanges.conf": - content => template($listchanges_config), + content => template($apt_listchanges_config), mode => 0644, owner => root, group => root, require => Package["apt-listchanges"]; } diff --git a/templates/Debian/listchanges_lenny.erb b/templates/Debian/listchanges_lenny.erb index fec3b68..3624b39 100644 --- a/templates/Debian/listchanges_lenny.erb +++ b/templates/Debian/listchanges_lenny.erb @@ -1,7 +1,7 @@ [apt] -frontend=<%= listchanges_frontend %> -email_address=<%= listchanges_email %> -confirm=<%= listchanges_confirm %> -save_seen=<%= listchanges_saveseen %> -which=<%= listchanges_which %> +frontend=<%= apt_listchanges_frontend %> +email_address=<%= apt_listchanges_email %> +confirm=<%= apt_listchanges_confirm %> +save_seen=<%= apt_listchanges_saveseen %> +which=<%= apt_listchanges_which %> |