Class name fixes; removing storeconfig block

diff --git a/manifests/master.pp b/manifests/master.pp
index d3f3e88c80a1b73a7bb6cc022311ef5bd49a770b..54898a08efb1621435c59f046ed866efaccba79b 100644 (file)
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -26,11 +26,11 @@ class puppet::master(
   #
   # A better approach is to keep certificates at /etc/puppet/ssl (and hence at your puppet repo).
   if $puppetmaster_manage_ca == true {
-    include puppetmaster::ca
+    include puppet::master::ca
   }
 
   # then include puppet class
-  class { 'puppetd':
+  class { 'puppet::daemon':
     master      => true,
     main_master => $main,
   }
@@ -148,19 +148,4 @@ class puppet::master(
     mode   => 0700,
   }
 
-  # for storeconfigs
-  include mysql::server
-
-  # Database creation as suggested by
-  # http://reductivelabs.com/trac/puppet/wiki/Recipes/MySQLStoredConfiguration
-  #exec { "create-storeconfigs-db":
-  #    command         => "/usr/bin/mysqladmin create puppet",
-  #    unless          => "/usr/bin/mysqlcheck -s puppet",
-  #    notify          => Exec["create-storeconfigs-user"],
-  #}
-  #exec { "create-storeconfigs-user":
-  #    command         => "/usr/bin/mysql -e 'grant all privileges on puppet.* to puppet@localhost identified by \"puppet\"'",
-  #    refreshonly     => true,
-  #}
-
 }