Merge branch 'master' of git://git.puppet.immerda.ch/module-puppet

Conflicts:
	files/master/config.ru
	files/master/puppet.conf
	manifests/base.pp
	manifests/centos.pp
	manifests/cron.pp
	manifests/cron/base.pp
	manifests/cron/linux.pp
	manifests/debian.pp
	manifests/init.pp
	manifests/linux.pp
	manifests/master/linux.pp
	manifests/master/package/debian.pp
	manifests/puppetmaster/base.pp
	manifests/puppetmaster/centos.pp
	manifests/puppetmaster/checklastrun.pp
	manifests/puppetmaster/checklastrun/disable.pp
	manifests/puppetmaster/cleanup_reports.pp
	manifests/puppetmaster/cleanup_reports/disable.pp
	manifests/puppetmaster/debian.pp
	manifests/puppetmaster/package.pp
	manifests/puppetmaster/package/base.pp
	manifests/puppetmaster/passenger.pp

1 files changed, 72 insertions, 0 deletions

diff --git a/manifests/master/dashboard.pp b/manifests/master/dashboard.pp
new file mode 100644
index 0000000..4cbee12
--- /dev/null
+++ b/manifests/master/dashboard.pp
@@ -0,0 +1,72 @@
+# simple installation of a puppet dashboard
+class puppet::master::dashboard(
+  $settings       = {},
+  $service        = true,
+  $mysql_host     = '127.0.0.1',
+  $mysql_password,
+) {
+
+  package{'puppet-dashboard':
+    ensure => installed,
+  }
+
+  if $mysql_host == '127.0.0.1' {
+    mysql::default_database{
+      'dashboard':
+        password  => mysql_password($mysql_password),
+        host      => '127.0.0.1',
+        require   => Package['puppet-dashboard'],
+        before    => File['/usr/share/puppet-dashboard/config/database.yml'],
+    }
+  }
+
+  file{
+    '/usr/share/puppet-dashboard/config/database.yml':
+      content => template('puppet/master/dashboard/database.yml.erb'),
+      owner   => root,
+      group   => 'puppet-dashboard',
+      mode    => '0640',
+      require => Package['puppet-dashboard'];
+    '/usr/share/puppet-dashboard/config/settings.yml':
+      content => template('puppet/master/dashboard/settings.yml.erb'),
+      owner   => root,
+      group   => 'puppet-dashboard',
+      mode    => '0640';
+  } ~> exec{
+    'rake RAILS_ENV=production db:migrate':
+      cwd         => '/usr/share/puppet-dashboard',
+      user        => 'puppet-dashboard',
+      refreshonly => true;
+  } -> service{
+    'puppet-dashboard-workers':
+      ensure  => running,
+      enable  => true;
+  }
+
+  file{'/etc/cron.daily/puppet-dashboard_cleanup':
+    content   => "#/bin/bash
+cd /usr/share/puppet-dashboard
+su - puppet-dashboard -s /bin/bash -c 'RAILS_ENV=production /usr/bin/rake reports:prune upto=1 unit=mon >> /usr/share/puppet-dashboard/log/cron.log'
+su - puppet-dashboard -s /bin/bash -c 'RAILS_ENV=production /usr/bin/rake reports:prune:orphaned >> /usr/share/puppet-dashboard/log/cron.log'
+su - puppet-dashboard -s /bin/bash -c 'RAILS_ENV=production /usr/bin/rake db:raw:optimize >> /usr/share/puppet-dashboard/log/cron.log'\n",
+      owner   => 'root',
+      group   => 0,
+      mode    => '0755',
+      require => Service['puppet-dashboard-workers'];
+  }
+
+  service{'puppet-dashboard': }
+  if $service {
+    Service['puppet-dashboard']{
+      ensure    => running,
+      enable    => true,
+      subscribe => File['/usr/share/puppet-dashboard/config/database.yml',
+        '/usr/share/puppet-dashboard/config/settings.yml'],
+    }
+  } else {
+    Service['puppet-dashboard']{
+      ensure  => stopped,
+      enable  => false,
+    }
+  }
+}