diff options
author | Micah <micah@riseup.net> | 2015-03-01 00:34:37 +0000 |
---|---|---|
committer | Micah <micah@riseup.net> | 2015-03-01 00:34:37 +0000 |
commit | 70d2dd696696b14c5011580f994c6520b028f32a (patch) | |
tree | acd91c59fea86768f81d98e262ed1677f646fa47 /templates | |
parent | beae5a608dd1b1d370917896d853a6b53ad73a45 (diff) | |
parent | 0bb70b28a7c7679d0e07fd75230d40203c0d53b5 (diff) |
Merge branch 'merge_immerda' into 'master'
Merge immerda's changes
GENERAL CHANGES
* Now uses parameterized classes
* Deprecates all top-scope "$puppet_*" variables
* File source path changed from "site-puppet" to "site_puppet"
master/puppet.conf
* [main] default vardir changed /srv/puppet to /var/lib/puppet
* [main] plugindest removed
* [agent] logdest removed
* [environments] removed
base.pp
* new $puppet::config, $puppet::config_content
cron/base.pp
* new $puppet::cron::cron_time, $puppet::http_compression, $puppet::cron::stop_service
cron.pp
* new puppet::cron parameterized class
debian.pp
* $puppet_ensure_version now $puppet::ensure_version
init.pp
* new puppet parameteried class
* $use_shorewall deprecated
linux.pp
* $facter_ensure_version now $puppet::facter_ensure_version
master/linux.pp
* $puppetmaster_mode changed to $puppet::master::mode
* does not require apache::base
master
* class puppet:puppetmaster::* renamed puppet::master::*
* $puppet_fileserverconfig changed to $puppet::master::fileserver
* added $puppet::master::config_content
* $puppetmaster_storeconfigs changed to $puppet::master::storeconfigs
master/lastruncheck.pp
* $::puppet_lastruncheck_ignorehosts changed to $puppet::master::lastruncheck_ignorehosts
* $::puppet_lastruncheck_ignorehosts_str changed to $puppet::master::lastruncheck_ignorehosts_str
* $::puppet_lastruncheck_timeout_str changed to $puppet::master::lastruncheck_timeout_str
* does not include cron
* /etc/cron.d/puppetlast command changed
master/cleanupreports
* $puppetmaster_cleanup_reports[_dir] changed to $puppet::master::reports[_dir]
* cron filename changed
master/passenger
* does not install puppetmaster-passenger package on Debian anymore
* restart mechanism by creating /etc/puppet/rack/tmp/restart.txt
* does not manage /usr/share/puppet/rack/puppetmasterd/config.ru anymore, config.ru expected at /etc/puppet/rack (check your Apache configs)
See merge request !1
Diffstat (limited to 'templates')
-rw-r--r-- | templates/master/dashboard/database.yml.erb | 8 | ||||
-rw-r--r-- | templates/master/dashboard/settings.yml.erb | 90 |
2 files changed, 98 insertions, 0 deletions
diff --git a/templates/master/dashboard/database.yml.erb b/templates/master/dashboard/database.yml.erb new file mode 100644 index 0000000..5c39db5 --- /dev/null +++ b/templates/master/dashboard/database.yml.erb @@ -0,0 +1,8 @@ +production: + adapter: mysql + database: 'dashboard' + host: '<%= @mysql_host %>' + username: 'dashboard' + password: '<%= @mysql_password %>' + encoding: utf8 + diff --git a/templates/master/dashboard/settings.yml.erb b/templates/master/dashboard/settings.yml.erb new file mode 100644 index 0000000..95b79c9 --- /dev/null +++ b/templates/master/dashboard/settings.yml.erb @@ -0,0 +1,90 @@ +#===[ Settings ]========================================================= +# +# This file is meant for storing setting information that is never +# published or committed to a revision control system. +# +# Do not modify this "config/settings.yml.example" file directly -- you +# should copy it to "config/settings.yml" and customize it there. +# +#---[ Values ]---------------------------------------------------------- + +# Node name to use when contacting the puppet master. This is the +# CN that is used in Dashboard's certificate. +cn_name: 'dashboard' + +ca_crl_path: 'certs/dashboard.ca_crl.pem' + +ca_certificate_path: 'certs/dashboard.ca_cert.pem' + +certificate_path: 'certs/dashboard.cert.pem' + +private_key_path: 'certs/dashboard.private_key.pem' + +public_key_path: 'certs/dashboard.public_key.pem' + +# Hostname of the certificate authority. +ca_server: 'puppet' + +# Port for the certificate authority. +ca_port: 8140 + +# Key length for SSL certificates +key_length: 1024 + +# The "inventory service" allows you to connect to a puppet master to retrieve and node facts +enable_inventory_service: false + +# Hostname of the inventory server. +inventory_server: 'puppet' + +# Port for the inventory server. +inventory_port: 8140 + +# Set this to true to allow Dashboard to display diffs on files that +# are archived in the file bucket. +use_file_bucket_diffs: false + +# Hostname of the file bucket server. +file_bucket_server: 'puppet' + +# Port for the file bucket server. +file_bucket_port: 8140 + +# Amount of time in seconds since last report before a node is considered no longer reporting +no_longer_reporting_cutoff: <%= @settings['no_longer_reporting_cutoff'] || 3600 %> + +# How many days of history to display on the "Daily Run Status" graph +daily_run_history_length: 30 + +use_external_node_classification: true + +# Uncomment the following line to set a local time zone. Run +# "rake time:zones:local" for the name of your local time zone. +#time_zone: 'Pacific Time (US & Canada)' + +# Look at http://ruby-doc.org/core/classes/Time.html#M000298 for the strftime formatting +datetime_format: '%Y-%m-%d %H:%M %Z' +date_format: '%A, %B %e, %Y' + +# Set this to the URL of an image. The image will be scaled to the specified dimensions. +custom_logo_url: '/images/dashboard_logo.png' +custom_logo_width: 155px +custom_logo_height: 23px +custom_logo_alt_text: 'Puppet Dashboard' + +# We will be deprecating using "http://dashboard_servername/reports" as the puppet master's reporturl. +# Set this to 'true' once you have changed all your puppet masters to send reports to +# "http://dashboard_servername/reports/upload" +disable_legacy_report_upload_url: false + +# Disables the UI and controller actions for editing nodes, classes, groups and reports. Report submission is still allowed +enable_read_only_mode: <%= @settings['enable_read_only_mode'] || 'false' %> + +# Default number of items of each kind to display per page +nodes_per_page: 20 +classes_per_page: 50 +groups_per_page: 50 +reports_per_page: 20 + +#===[ fin ]============================================================= + |