parameterize drush classes to match the rest of the yumrepos classes.

Add Tag1 RPM GPG key, and enable gpgcheck by default on drush repos

files/etc/pki/rpm-gpg/RPM-GPG-KEY-TAG1

@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFOSGToBEACi8XJ0t8g29RuoY/E5bx1OUIgpslZA29HbND6o3qYMNJxQJ3iw
+6OrFg49amsTzSwOAZwRw/gZ28Q7HmUhneIbtKMhZvFmrocYAbOnKkCuDTsws7flI
+O0EDOXWHxXUEgcoQFwGfi+dltY+ln3/0Q6HM1iV7iLv4gnh7O80pGyWVYQDTdrxt
+fI583M4883jpbt7/UK5cJzfoED8d9JVoNVctm8zEar3oAL6HBJFaxcX3FmFbnH2+
+pfEji4w/I2JcdptnAQVtcShD/XN1CCVHuldmobPZOck4721cNNoZI1GUDq20ZgQ6
+n6ShV1FA5D1H96n4DncjgprKm/rjQ/Agk4VUVnWDUCyYeMN0ar7tE8ayToN5kkQT
+PK1l12Nrs9Hd7gX4JbBcsxPVOg/eHZyf530QU5FRq7hwO8buR/wTZZe7Cqmg+szI
+ENik5AcfhYGWLJxX3F/uALcrZCCGCc67fEHPDVfgBhgO6bcdtYGHjNsVXRutGK30
+6kq9P38v2IL4UsRamKJCBnGd73EeY1LBiRury+cAKovAYiirE3CPjKAK8H+qGVl3
+SH1AymLvLrvEK+XJ4eDBhEcpo7CzrR8AjqoOjekCh3J/qIWs17hOQkEukBBLbEEq
+hLLNqmnNjYhm1R+EtoU6oXtTZA37W7bGs+Pgq8c7yR60vrdlzkb8wvEVrQARAQAB
+tDxUYWcxIENvbnN1bHRpbmcgUlBNIFNpZ25pbmcgS2V5IDxzdXBwb3J0QHRhZzFj
+b25zdWx0aW5nLmNvbT6JAjgEEwECACIFAlOSGToCGwMGCwkIBwMCBhUIAgkKCwQW
+AgMBAh4BAheAAAoJEJ0DNvHA6V3TCD0P/3OXle7xV4QRGvwTQjdv4W8LMYUZoYss
+m5vG3TvRlZu86Xl5u3Nmdtfd3cVqtws6KOTAbh0AKvkisE54P5viWxjSx0HTxcI3
+E1Ki2A6iJwLgMkh9nWoAng52eNfD4xDsK814MC1Osf0KMGwKzBTMwtVbnEwAEH56
+TOxW0soBniTDNKbIhik0yHQTXlbia+fbuEbKNVPK6m1rc9lH1PSyupno9y8vBp0a
+RvGoZE3nib53GxmcOHYiNm8jNynZ7v/B/khIrrMPowiovmm4RuWhWHGUqgJvUbds
+SwAjCbLIxvnznKbgq50BgQZxKQB1m6uaBau44Bl1ratFxvtFCwrWFEL2p+C5btXb
+tQKI1Qkm8EwXrMJlH8T0f/zlpzOS6Cc0q3qEYBkulkKYmg6smkkdsEBD07JCpSsf
+KQNLXPqqUjcf5WSErgDEP+zBo8DyVVKnGX0ZJnBGcoFOpSo2tjta5CH+5JzBGTtq
+w6+6CoYFM2bAgzlH0iSvo3aaIYz5bcWj7RnMxbYQELKRaaOKWrV76ozoM4gdrmmb
+5xR+I3E63tls6tKb5bh4UkuRaW3IBi3yAPrR2FnSR1P3Xn9Zx3LVlKOxaoml9ZN+
+uE0A9mT5DaUsZCQzODDUgC4lSiMXBZIP0d568SOEpVU5bU10Yb/F+70PN9mrszqV
+mXtk6oAr4FRj
+=x9iH
+-----END PGP PUBLIC KEY BLOCK-----

manifests/drush5.pp

@@ -1,10 +1,28 @@
-class yumrepos::drush5 {
+class yumrepos::drush5 (
+  $drush5_url = $yumrepos::params::drush5_url,
+  $drush5_enabled = $yumrepos::params::drush5_enabled,
+  $drush5_gpgcheck = $yumrepos::params::drush5_gpgcheck,
+  $drush5_includepkgs = $yumrepos::params::drush5_includepkgs,
+  $drush5_exclude = $yumrepos::params::drush5_exclude,
+) inherits yumrepos::params {
+
+  file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-TAG1":
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+    source => "puppet:///modules/yumrepos/etc/pki/rpm-gpg/RPM-GPG-KEY-TAG1",
+  }
 
   yumrepo { 'tag1-drush5':
-    descr      => 'Tag1 Drush 5',
-    baseurl => "http://pkg.tag1consulting.com/drush/drush-5/el${::operatingsystemmajrelease}/noarch/",
-    enabled   => '1',
-    gpgcheck   => '0',
+    descr       => 'Tag1 Drush 5',
+    baseurl     => $drush5_url,
+    enabled     => $drush5_enabled,
+    includepkgs => $drush5_includepkgs,
+    exclude     => $drush5_exclude,
+    gpgcheck    => $drush5_gpgcheck,
+    gpgkey      => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-TAG1",
+    require     => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-TAG1'],
   }
 
 }

manifests/drush6.pp

@@ -1,10 +1,28 @@
-class yumrepos::drush6 {
+class yumrepos::drush6 (
+  $drush6_url = $yumrepos::params::drush6_url,
+  $drush6_enabled = $yumrepos::params::drush6_enabled,
+  $drush6_gpgcheck = $yumrepos::params::drush6_gpgcheck,
+  $drush6_includepkgs = $yumrepos::params::drush6_includepkgs,
+  $drush6_exclude = $yumrepos::params::drush6_exclude,
+) inherits yumrepos::params {
+
+  file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-TAG1":
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+    source => "puppet:///modules/yumrepos/etc/pki/rpm-gpg/RPM-GPG-KEY-TAG1",
+  }
 
   yumrepo { 'tag1-drush6':
-    descr      => 'Tag1 Drush 6',
-    baseurl => "http://pkg.tag1consulting.com/drush/drush-6/el${::operatingsystemmajrelease}/noarch/",
-    enabled   => '1',
-    gpgcheck   => '0',
+    descr       => 'Tag1 Drush 6',
+    baseurl     => $drush6_url,
+    enabled     => $drush6_enabled,
+    includepkgs => $drush6_includepkgs,
+    exclude     => $drush6_exclude,
+    gpgcheck    => $drush6_gpgcheck,
+    gpgkey      => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-TAG1",
+    require     => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-TAG1'],
   }
 
 }

manifests/params.pp

@@ -57,10 +57,24 @@
   $varnish3_includepkgs = absent
   $varnish3_exclude = absent
 
-  # repoforge Settings. repoforge used to be called rpmforge
+  # Repoforge Settings.
   $repoforge_url = "http://apt.sw.be/redhat/el${::operatingsystemmajrelease}/en/${::architecture}/rpmforge"
   $repoforge_enabled = '1'
   $repoforge_gpgcheck = '1'
   $repoforge_includepkgs = absent
   $repoforge_exclude = absent
+
+  # Drush5 Settings.
+  $drush5_url = "http://pkg.tag1consulting.com/drush/drush-5/el${::operatingsystemmajrelease}/noarch"
+  $drush5_enabled = '1'
+  $drush5_includepkgs = absent
+  $drush5_exclude = absent
+  $drush5_gpgcheck = '1'
+
+  # Drush6 Settings.
+  $drush6_url = "http://pkg.tag1consulting.com/drush/drush-6/el${::operatingsystemmajrelease}/noarch"
+  $drush6_enabled = '1'
+  $drush6_includepkgs = absent
+  $drush6_exclude = absent
+  $drush6_gpgcheck = '1'
 }