From 0a4a8cc513ed3c33d257537917e07c713456577d Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 31 Mar 2016 14:46:25 -0300 Subject: Config cleanup --- config/bootstrap.yaml | 44 --------------------------- config/common.yaml | 26 ++++++++-------- config/hiera.yaml | 1 - config/node/puppet-bootstrap.example.org.yaml | 6 ++-- 4 files changed, 16 insertions(+), 61 deletions(-) delete mode 100644 config/bootstrap.yaml (limited to 'config') diff --git a/config/bootstrap.yaml b/config/bootstrap.yaml deleted file mode 100644 index ce72bfb..0000000 --- a/config/bootstrap.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -# -# Puppet Bootstrap Configuration Parameters. -# -# This file is responsible to set custom values to your new puppet repository -# to reflect the custom configuration for your infrastructure. -# -# This configuration is useful mostly after you cloned the puppet-boostrap module -# and want to configure it to boostrap a whole puppetmaster infrastructure. -# - -# The base domain for your infrastructure. -bootstrap::base_domain: 'vagrantup.com' - -# -# Root password. -# -# Use "mkpasswd -m sha-512" to generate root and first user's passwords. -bootstrap::root::password: '' - -# -# First user account -# -# Do not include "ssh-rsa " into the sshkey definition. -bootstrap::first_user: '' -bootstrap::first_user::password: '' -bootstrap::first_user::sshkey: '' -bootstrap::first_user::email: '' - -# -# First nodes -# - -# Hostname of the first server -bootstrap:first_hostname: '' - -# Create manifests and config for the first nodes? -bootstrap::first_nodes: false - -# MySQL password -mysql::server::rootpw: '' - -# Puppet master db password -nodo::role::master::db_password: '' diff --git a/config/common.yaml b/config/common.yaml index 3c6fe7b..225ab97 100644 --- a/config/common.yaml +++ b/config/common.yaml @@ -2,24 +2,24 @@ # # General # -nodo::subsystem::apt::include_src: false -nodo::subsystem::apt::use_next_release: false -nodo::subsystem::monitor::use_nagios: false -nodo::subsystem::monitor::address: "%{::fqdn}" +nodo::subsystem::apt::include_src : false +nodo::subsystem::apt::use_next_release : false +nodo::subsystem::monitor::use_nagios : false +nodo::subsystem::monitor::address : "%{::fqdn}" # # Firewall # -firewall::ssl_ratelimit: "s:ssl:200/min:20" -firewall::local_net: false -firewall::local::manage_host: true -firewall::local::manage_iface: false +firewall::ssl_ratelimit : "s:ssl:200/min:20" +firewall::local_net : false +firewall::local::manage_host : true +firewall::local::manage_iface : false # # Mail # -mail::sympa::subdomain: "listas" -mail::sympa::lang: "pt_BR" +mail::sympa::subdomain : "listas" +mail::sympa::lang : "pt_BR" # # Monitoring @@ -29,9 +29,9 @@ nodo::munin_node::allow: '127.0.0.1:192.168.0.[0-9]*:192.168.1.[0-9]*' # # Timezone and ntp # -ntp::zone: "Brazil/East" -ntp::pool: "south-america.pool.ntp.org" -ntp::servers: +ntp::zone : "Brazil/East" +ntp::pool : "south-america.pool.ntp.org" +ntp::servers : - 'a.ntp.br' - 'b.ntp.br' - 'c.ntp.br' diff --git a/config/hiera.yaml b/config/hiera.yaml index 2e5600c..62e2d71 100644 --- a/config/hiera.yaml +++ b/config/hiera.yaml @@ -29,5 +29,4 @@ - 'virtual/%{::virtual}' - 'location/%{::nodo::location}' - 'domain/%{::domain}' - - bootstrap - common diff --git a/config/node/puppet-bootstrap.example.org.yaml b/config/node/puppet-bootstrap.example.org.yaml index c108e7d..6197409 100644 --- a/config/node/puppet-bootstrap.example.org.yaml +++ b/config/node/puppet-bootstrap.example.org.yaml @@ -9,6 +9,6 @@ mysql::server::rootpw: '9pRfteNbSFFyrHhackme' # # Backup # -nodo::subsystem::backup::localhost: false -nodo::subsystem::backup::encryptkey: 'none' -nodo::subsystem::backup::password: 'hacked' +nodo::subsystem::backup::localhost : false +nodo::subsystem::backup::encryptkey : 'none' +nodo::subsystem::backup::password : 'hacked' -- cgit v1.2.3