new style for 2.7

19 files changed, 0 insertions, 274 deletions

diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp
deleted file mode 100644
index 25709ea..0000000
--- a/manifests/puppetmaster/base.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-class puppet::puppetmaster::base inherits puppet::base {
-
-  File[puppet_config]{
-    source => [ "puppet:///modules/site-puppet/master/puppet.conf",
-                "puppet:///modules/puppet/master/puppet.conf" ],
-  }
-
-  if !$puppet_fileserverconfig { $puppet_fileserverconfig  = '/etc/puppet/fileserver.conf' }
-
-  file { "$puppet_fileserverconfig":
-    source => [ "puppet:///modules/site-puppet/master/${fqdn}/fileserver.conf",
-                "puppet:///modules/site-puppet/master/fileserver.conf",
-                "puppet:///modules/puppet/master/fileserver.conf" ],
-    owner => root, group => puppet, mode => 640;
-  } 
-
-  if $puppetmaster_storeconfigs {
-    include puppet::puppetmaster::storeconfigs
-  }
-
-
-  if $puppetmaster_mode == 'passenger' {
-    include puppet::puppetmaster::passenger
-    File[$puppet_fileserverconfig]{
-      notify => Exec['notify_passenger_puppetmaster'],
-    }
-    File[puppet_config]{
-      notify => Exec['notify_passenger_puppetmaster'],
-    }
-  } else {
-    File[$puppet_fileserverconfig]{
-      notify => Service[puppetmaster],
-    }
-    File[puppet_config]{
-      notify => Service[puppetmaster],
-    }
-  }
-}
diff --git a/manifests/puppetmaster/centos.pp b/manifests/puppetmaster/centos.pp
deleted file mode 100644
index 2673a4d..0000000
--- a/manifests/puppetmaster/centos.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# manifests/puppetmaster/centos.pp
-class puppet::puppetmaster::centos inherits puppet::puppetmaster::package {
-
-  file { '/etc/sysconfig/puppetmaster':
-    source => [ "puppet:///modules/site-puppet/sysconfig/${fqdn}/puppetmaster",
-                "puppet:///modules/site-puppet/sysconfig/${domain}/puppetmaster",
-                "puppet:///modules/site-puppet/sysconfig/puppetmaster",
-                "puppet:///modules/puppet/sysconfig/puppetmaster" ],
-    notify => Service[puppetmaster],
-    owner => root, group => 0, mode => 0644;
-  }
-}
diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
deleted file mode 100644
index 93ed8b9..0000000
--- a/manifests/puppetmaster/checklastrun.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-class puppet::puppetmaster::checklastrun {
-
-  $puppet_lastruncheck_ignorehosts_str = $puppet_lastruncheck_ignorehosts ? {
-    '' => '',
-    undef => '',
-    default => "--ignore-hosts ${puppet_lastruncheck_ignorehosts}"
-  }
-
-  $puppet_lastruncheck_timeout_str = $puppet_lastruncheck_timeout ? {
-    '' => '',
-    undef => '',
-    default => "--timeout ${puppet_lastruncheck_timeout}"
-  }
-
-  file{
-    '/usr/local/sbin/puppetlast':
-      source => [ "puppet:///modules/puppet/master/lastruncheck" ],
-      owner => root, group => 0, mode => 0700;
-
-    '/etc/cron.d/puppetlast.cron':
-      content => "${puppetmaster_lastruncheck_cron} root /usr/local/sbin/puppetlast ${puppet_lastruncheck_timeout_str} ${puppet_lastruncheck_ignorehosts_str} ${$puppet_lastruncheck_additionaloptions}\n",
-      require => File["/usr/local/sbin/puppetlast"],
-      owner => root, group => 0, mode => 0644,
-  }
-}
diff --git a/manifests/puppetmaster/checklastrun/disable.pp b/manifests/puppetmaster/checklastrun/disable.pp
deleted file mode 100644
index 8fff212..0000000
--- a/manifests/puppetmaster/checklastrun/disable.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class puppet::puppetmaster::checklastrun::disable inherits puppet::puppetmaster::checklastrun {
-
-  File['/usr/local/sbin/puppetlast']{
-    source => undef,
-    ensure => absent,
-  }
-
-  File['/etc/cron.d/puppetlast.cron']{
-    ensure => absent,
-  }
-}
-
diff --git a/manifests/puppetmaster/cleanup_reports.pp b/manifests/puppetmaster/cleanup_reports.pp
deleted file mode 100644
index 005a4d7..0000000
--- a/manifests/puppetmaster/cleanup_reports.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class puppet::puppetmaster::cleanup_reports {
-  case $puppetmaster_reports_dir { '',undef: { $puppetmaster_reports_dir = '/var/lib/puppet/reports' } }
-  # clean up reports older than $puppetmaster_cleanup_reports days
-  file { '/etc/cron.daily/puppet_reports_cleanup.sh':
-    content => "#!/bin/bash\nfind ${puppetmaster_reports_dir} -maxdepth 2 -type f -ctime +${puppetmaster_cleanup_reports} -exec rm {} \\;\n",
-    owner => root, group => 0, mode => 0700;
-  }
-}
diff --git a/manifests/puppetmaster/cleanup_reports/disable.pp b/manifests/puppetmaster/cleanup_reports/disable.pp
deleted file mode 100644
index 8636223..0000000
--- a/manifests/puppetmaster/cleanup_reports/disable.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class puppet::puppetmaster::cleanup_reports::disable inherits puppet::puppetmaster::cleanup_reports {
-
-  File['/etc/cron.daily/puppet_reports_cleanup.sh']{
-    ensure => absent,
-  }
-}
diff --git a/manifests/puppetmaster/cluster.pp b/manifests/puppetmaster/cluster.pp
deleted file mode 100644
index 8d635ab..0000000
--- a/manifests/puppetmaster/cluster.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class puppet::puppetmaster::cluster inherits puppet::puppetmaster {
-
-  include puppet::puppetmaster::cluster::base
-
-}
diff --git a/manifests/puppetmaster/cluster/base.pp b/manifests/puppetmaster/cluster/base.pp
deleted file mode 100644
index 8c90153..0000000
--- a/manifests/puppetmaster/cluster/base.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class puppet::puppetmaster::cluster::base inherits puppet::puppetmaster::base {
-
-  include mongrel, nginx
-  
-  File[puppet_config] {
-    require +> [ Package[mongrel], Package[nginx], File[nginx_config] ],
-  }
-}
-
diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp
deleted file mode 100644
index 8cee0ea..0000000
--- a/manifests/puppetmaster/debian.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class puppet::puppetmaster::debian inherits puppet::puppetmaster::package {
-
-  if $puppetmaster_mode != 'passenger' {
-    case $lsbdistcodename {
-      squeeze,sid: {
-        Service['puppetmaster'] { hasstatus => true, hasrestart => true }
-      }
-    }
-  }
-
-  file { '/etc/default/puppetmaster':
-    source => [ "puppet:///modules/site-puppet/master/debian/${fqdn}/puppetmaster",
-                "puppet:///modules/site-puppet/master/debian/${domain}/puppetmaster",
-                "puppet:///modules/site-puppet/master/debian/puppetmaster",
-                "puppet:///modules/puppet/master/debian/puppetmaster" ],
-    notify => Service[puppetmaster],
-    owner => root, group => 0, mode => 0644;
-  }
-}
diff --git a/manifests/puppetmaster/hasdb.pp b/manifests/puppetmaster/hasdb.pp
deleted file mode 100644
index 2aca0e6..0000000
--- a/manifests/puppetmaster/hasdb.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-define puppet::puppetmaster::hasdb (
-  $dbtype = 'mysql',
-  $dbname = 'puppet',
-  $dbhost = 'localhost',
-  # this is needed due to the collection of the databases
-  $dbhostfqdn = "${fqdn}",
-  $dbuser = 'puppet',
-  $dbpwd = $puppet_storeconfig_password,
-  $dbconnectinghost = 'locahost' )
-{
-
-  if !$puppet_storeconfig_password { fail("No \$puppet_storeconfig_password is set, please set it in your manifests or site.pp to add a password") }
-
-  case $dbtype {
-    'mysql': {  puppet::puppetmaster::hasdb::mysql{$name: dbname => $dbname, dbhost => $dbhost, dbuser => $dbuser, dbpwd => $dbpwd, } }
-  }
-}
diff --git a/manifests/puppetmaster/hasdb/mysql.pp b/manifests/puppetmaster/hasdb/mysql.pp
deleted file mode 100644
index 1ed122a..0000000
--- a/manifests/puppetmaster/hasdb/mysql.pp
+++ /dev/null
@@ -1,32 +0,0 @@
-# don't use this define use the general interface
-define puppet::puppetmaster::hasdb::mysql (
-  $dbname = 'puppet',
-  $dbhost = 'localhost',
-  $dbhostfqdn = "${fqdn}",
-  $dbuser = 'puppet',
-  $dbpwd,
-  $dbconnectinghost = 'localhost' )
-{
-  @@mysql_database { $dbname:
-    tag => "mysql_${dbhostfqdn}",
-  }
-
-  @@mysql_user { "${dbuser}@${dbconnectinghost}":
-    password_hash => mysql_password("$dbpwd"),
-    require => Mysql_database[$dbname],
-    tag => "mysql_${dbhostfqdn}",
-  }
-
-  @@mysql_grant { "${dbuser}@${dbconnectinghost}/${dbname}":
-    privileges => all,
-    require => Mysql_user["${dbuser}@${dbconnectinghost}"],
-    tag => "mysql_${dbhostfqdn}",
-  }
-
-  if $use_munin {
-    munin::plugin::deploy { 'puppetresources':
-      source => "puppet/munin/puppetresources.mysql",
-      config => "env.mysqlopts --user=$dbuser --password=$dbpwd -h $dbhost\nenv.puppetdb $dbname",
-    }
-  }
-}
diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp
deleted file mode 100644
index 2670203..0000000
--- a/manifests/puppetmaster/linux.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class puppet::puppetmaster::linux inherits puppet::linux {
-  
-  if $puppetmaster_mode == 'passenger' {
-    exec { 'notify_passenger_puppetmaster':
-      refreshonly => true,
-      command => 'touch /etc/puppet/rack/tmp/restart.txt && sleep 1 && rm /etc/puppet/rack/tmp/restart.txt',
-    }
-  } else {
-    service { 'puppetmaster':
-      ensure => running,
-      enable => true,
-      require => [ Package[puppet] ],
-    }
-  }
-  Service[puppet]{
-    require +> Service[puppetmaster],
-  }
-}
diff --git a/manifests/puppetmaster/munin.pp b/manifests/puppetmaster/munin.pp
deleted file mode 100644
index 4500b74..0000000
--- a/manifests/puppetmaster/munin.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class puppet::puppetmaster::munin {
-
-  munin::plugin::deploy {
-    [ 'puppetmaster_memory', 'puppet_clients' ]:
-      source => "puppet/munin/puppet_",
-      config => "user root"
-  }
-
-}
diff --git a/manifests/puppetmaster/package.pp b/manifests/puppetmaster/package.pp
deleted file mode 100644
index 145792e..0000000
--- a/manifests/puppetmaster/package.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# manifests/puppetmaster/package.pp
-
-class puppet::puppetmaster::package inherits puppet::puppetmaster::linux {
-  case $operatingsystem {
-    centos: { include puppet::puppetmaster::package::centos }
-    debian: { include puppet::puppetmaster::package::debian }
-    default: { include puppet::puppetmaster::package::base }
-  }
-}
diff --git a/manifests/puppetmaster/package/base.pp b/manifests/puppetmaster/package/base.pp
deleted file mode 100644
index 363f827..0000000
--- a/manifests/puppetmaster/package/base.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class puppet::puppetmaster::package::base inherits puppet::puppetmaster::package {
-
-  package { 'puppetmaster':
-    ensure => present,
-  }
-
-  Service['puppetmaster']{
-    require +> Package['puppetmaster'],
-  }
-}
diff --git a/manifests/puppetmaster/package/centos.pp b/manifests/puppetmaster/package/centos.pp
deleted file mode 100644
index 43361fd..0000000
--- a/manifests/puppetmaster/package/centos.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class puppet::puppetmaster::package::centos inherits puppet::puppetmaster::package::base {
-
-  Package['puppetmaster']{
-    name => 'puppet-server',
-    alias => 'puppetmaster',
-  }
-}
diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp
deleted file mode 100644
index 9d7d397..0000000
--- a/manifests/puppetmaster/package/debian.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package::base {
-
-  package { 'puppetmaster-common':
-    ensure => present,
-  }
-
-  Package['puppetmaster']{
-    require => Package['puppetmaster-common']
-  }
-}
diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp
deleted file mode 100644
index c4bc062..0000000
--- a/manifests/puppetmaster/passenger.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# class to use passenger for serving puppetmaster
-
-class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base {
-
-  include ::passenger
-
-  # A reference configuration is available at :
-  # http://github.com/reductivelabs/puppet/tree/master/ext/rack
-
-  file {
-    ['/etc/puppet/rack', '/etc/puppet/rack/public', '/etc/puppet/rack/tmp']:
-      ensure => directory,
-      owner => root, group => 0, mode => 0755;
-
-    '/etc/puppet/rack/config.ru':
-      source => [ "puppet:///modules/site-puppet/master/config.ru",
-                  "puppet:///modules/puppet/master/config.ru" ],
-      owner => puppet, group => 0, mode => 0644;
-  }
-}
diff --git a/manifests/puppetmaster/storeconfigs.pp b/manifests/puppetmaster/storeconfigs.pp
deleted file mode 100644
index 63c1191..0000000
--- a/manifests/puppetmaster/storeconfigs.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# This class sets up the necessary ActiveRecord bits
-# so storeconfigs works.
-
-class puppet::puppetmaster::storeconfigs {
-  include rails
-  include mysql::server
-  include mysql::client::ruby
-}