From 0cb3cd816e37a81ffc89e68b774d34930c5acc36 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 15 Apr 2012 15:41:58 +0200
Subject: Migrate - in class names to _

In newer puppet releases the old way to name class/modules with a -,
won't anymore be supported.

Conflicts:

	manifests/unattended_upgrades.pp
---
 manifests/cron/dist-upgrade.pp      | 23 -----------------------
 manifests/cron/dist_upgrade.pp      | 23 +++++++++++++++++++++++
 manifests/dist_upgrade/initiator.pp |  4 ++--
 manifests/init.pp                   | 12 ++++++------
 manifests/preseeded_package.pp      |  2 +-
 manifests/unattended_upgrades.pp    |  4 ++--
 6 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 manifests/cron/dist-upgrade.pp
 create mode 100644 manifests/cron/dist_upgrade.pp

(limited to 'manifests')

diff --git a/manifests/cron/dist-upgrade.pp b/manifests/cron/dist-upgrade.pp
deleted file mode 100644
index 2568cb7..0000000
--- a/manifests/cron/dist-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-class apt::cron::dist-upgrade inherits apt::cron::base {
-
-  $action = "autoclean -y
-dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-confold'
-"
-
-  file { "/etc/cron-apt/action.d/3-download":
-    ensure => absent,
-  }
-
-  package { "apt-listbugs": ensure => absent }
-
-  config_file { "/etc/cron-apt/action.d/4-dist-upgrade":
-    content => $action,
-    require => Package[cron-apt]
-  }
-
-  config_file { "/etc/cron-apt/config.d/MAILON":
-    content => "MAILON=upgrade\n",
-    require => Package[cron-apt]
-  }
-
-}
diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp
new file mode 100644
index 0000000..1c8adb1
--- /dev/null
+++ b/manifests/cron/dist_upgrade.pp
@@ -0,0 +1,23 @@
+class apt::cron::dist_upgrade inherits apt::cron::base {
+
+  $action = "autoclean -y
+dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-confold'
+"
+
+  file { "/etc/cron-apt/action.d/3-download":
+    ensure => absent,
+  }
+
+  package { "apt-listbugs": ensure => absent }
+
+  config_file { "/etc/cron-apt/action.d/4-dist-upgrade":
+    content => $action,
+    require => Package[cron-apt]
+  }
+
+  config_file { "/etc/cron-apt/config.d/MAILON":
+    content => "MAILON=upgrade\n",
+    require => Package[cron-apt]
+  }
+
+}
diff --git a/manifests/dist_upgrade/initiator.pp b/manifests/dist_upgrade/initiator.pp
index 6d57947..571cd51 100644
--- a/manifests/dist_upgrade/initiator.pp
+++ b/manifests/dist_upgrade/initiator.pp
@@ -10,8 +10,8 @@ class apt::dist_upgrade::initiator inherits apt::dist_upgrade {
     path     => "${initiator_abs}",
     checksum => md5,
     source   => [
-                 "puppet:///modules/site-apt/${fqdn}/${initiator}",
-                 "puppet:///modules/site-apt/${initiator}",
+                 "puppet:///modules/site_apt/${fqdn}/${initiator}",
+                 "puppet:///modules/site_apt/${initiator}",
                  "puppet:///modules/apt/${initiator}",
                 ],
   }
diff --git a/manifests/init.pp b/manifests/init.pp
index 960f18d..2ae691f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -90,23 +90,23 @@ class apt {
   }
 
   apt_conf { "02show_upgraded":
-    source => [ "puppet:///modules/site-apt/${fqdn}/02show_upgraded",
-                "puppet:///modules/site-apt/02show_upgraded",
+    source => [ "puppet:///modules/site_apt/${fqdn}/02show_upgraded",
+                "puppet:///modules/site_apt/02show_upgraded",
                 "puppet:///modules/apt/02show_upgraded" ]
   }
 
   if ( $virtual == "vserver" ) {
     apt_conf { "03clean_vserver":
-      source => [ "puppet:///modules/site-apt/${fqdn}/03clean_vserver",
-                  "puppet:///modules/site-apt/03clean_vserver",
+      source => [ "puppet:///modules/site_apt/${fqdn}/03clean_vserver",
+                  "puppet:///modules/site_apt/03clean_vserver",
                   "puppet:///modules/apt/03clean_vserver" ],
       alias => "03clean";
     }
   }
   else {
     apt_conf { "03clean":
-      source => [ "puppet:///modules/site-apt/${fqdn}/03clean",
-                  "puppet:///modules/site-apt/03clean",
+      source => [ "puppet:///modules/site_apt/${fqdn}/03clean",
+                  "puppet:///modules/site_apt/03clean",
                   "puppet:///modules/apt/03clean" ]
     }
   }
diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index 839f200..d831934 100644
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -1,7 +1,7 @@
 define apt::preseeded_package ($content = "", $ensure = "installed") {
   $seedfile = "/var/cache/local/preseeding/$name.seeds"
   $real_content = $content ? { 
-    ""      => template ( "site-apt/$lsbdistcodename/$name.seeds" ),
+    ""      => template ( "site_apt/$lsbdistcodename/$name.seeds" ),
     default => $content
   }   
 
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index f31a3fb..34d4d31 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -6,8 +6,8 @@ class apt::unattended_upgrades {
   }
 
   apt_conf { "50unattended-upgrades":
-    source  => ["puppet:///modules/site-apt/$lsbdistcodename/50unattended-upgrades",
-		"puppet:///modules/site-apt/50unattended-upgrades",
+    source  => ["puppet:///modules/site_apt/$lsbdistcodename/50unattended-upgrades",
+		"puppet:///modules/site_apt/50unattended-upgrades",
 		"puppet:///modules/apt/$lsbdistcodename/50unattended-upgrades",
 		"puppet:///modules/apt/50unattended-upgrades" ],
     require => Package['unattended-upgrades'],
-- 
cgit v1.2.3