enable sso_rp

[dsa-puppet.git] / modules / site / manifests / alternative.pp

diff --git a/modules/site/manifests/alternative.pp b/modules/site/manifests/alternative.pp
index d7488bee348d2880584574009e1db780ba0f37aa..2853e11d9ce106541786d72cec5a1476d1216d60 100644 (file)
--- a/modules/site/manifests/alternative.pp
+++ b/modules/site/manifests/alternative.pp
@@ -1,25 +1,13 @@
 define site::alternative ($linkto, $ensure = present) {
        case $ensure {
                present: {
-                       if $::lsbdistcodename == 'lenny' {
-                               exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}":
-                                       unless => "[ $(basename $(readlink -f /etc/alternatives/${name})) = ${linkto} ]",
-                               }
-                       } else {
-                               exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}":
-                                       unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') = ${linkto} ]",
-                               }
+                       exec { "/usr/bin/update-alternatives --set ${name} ${linkto}":
+                               unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') = ${linkto} ]",
                        }
                }
                absent: {
-                       if $::lsbdistcodename == 'lenny' {
-                               exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":
-                                       unless => "[ $(basename $(readlink -f /etc/alternatives/${name})) != ${linkto} ]",
-                               }
-                       } else {
-                               exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":
-                                       unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') != ${linkto} ]",
-                               }
+                       exec { "/usr/bin/update-alternatives --remove ${name} ${linkto}":
+                               unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') != ${linkto} ]",
                        }
                }
                default: { fail ( "Unknown ensure value: '$ensure'" ) }