Config cleanup

diff --git a/TODO.md b/TODO.md
index db98fdc8336b975b3b92f1e4f81e65a4af3bdab1..be0395e97acea3473c3db6f03d1a9c8bac526523 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -8,7 +8,6 @@ High priority
 - virtual: migrate to kvm-manager, purge util-vserver.
 - switch from syslog-ng to rsyslog with anonimization.
 - nodo: journald: volatile logs only.
-- puppet: key deployment.
 - sshd:
   - https://stribika.github.io/2015/01/04/secure-secure-shell.html
   - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=774711#60

diff --git a/config/bootstrap.yaml b/config/bootstrap.yaml
deleted file mode 100644 (file)
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 3c6fe7baf28f8162bcc7a111fc74483be8d0f0c4..225ab97fef677c2cbcc51701e65ff4819d417861 100644 (file)
--- 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 2e5600c9c7e7e68b7f93b57b48314a051c6c5f8a..62e2d715f89486e91bb0a5928fa140a032cc081d 100644 (file)
--- 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 c108e7d5ecbe0091d2e6187cb9bf9d98f6a38f22..61974095ad5715c71815e1ae52483148ca89d3b8 100644 (file)
--- 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'