Cleaning site.pp as we're using hiera now

diff --git a/templates/puppet/modules.pp.erb b/templates/puppet/modules.pp.erb
index ee9839716d4972335760d91067089c75c1414b38..3df3fe32db62ef6b38465016da4df8cdc3e1a47c 100644 (file)
--- a/templates/puppet/modules.pp.erb
+++ b/templates/puppet/modules.pp.erb
@@ -1,5 +1,5 @@
 #
-# These are the modules we use.
+# Module definitions.
 #
 
 # Nodo automatically import all modules we need.

diff --git a/templates/puppet/site.pp.erb b/templates/puppet/site.pp.erb
index eaeff88f237b2f0fa4c4d4311d031d57956be6fe..6f3e5aaa1e0c73aa6fc6ae9331737d6d6095f7cd 100644 (file)
--- a/templates/puppet/site.pp.erb
+++ b/templates/puppet/site.pp.erb
@@ -1,58 +1,8 @@
 #
 # Puppet site configuration.
 #
+
 import "classes/users.pp"
 import "classes/websites.pp"
 import "modules.pp"
 import "nodes.pp"
-
-# Default execution path
-Exec { path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" }
-
-# Fileserver backup
-filebucket { server: server => "admin.<%= domain %>" }
-File { backup => server }
-
-# General configuration
-$network_name = '<%= domain %> cloud'
-
-# MySQL password
-$mysql_rootpw = '<%= mysql_rootpw %>'
-
-# Puppetmaster db password
-$puppetmaster_db_password = '<%= puppetmaster_db_password %>'
-
-# OpenDNS nameservers in case we need on DNS outages
-$opendns_nameservers = '208.67.222.222:208.67.220.220'
-
-# Munin
-$global_munin_allow = '192.168.0.[0-9]*'
-
-# We want puppet to manage it's certificates
-$puppetmaster_manage_ca = false
-
-# Reprepro
-#$reprepro_uploaders = [ '' ]
-
-# Mail configuration
-#$root_mail_recipient = 'messages@lists.domain.org'
-#$postfix_mynetworks  = '127.0.0.0/8, 192.168.0.0/28'
-#$postfixadmin_database_password = ''
-#$postfixadmin_setup_hash = ''
-#$sympa_database_password = ''
-#$sympa_listmasters = 'user1@domain.org, user2@domain.org'
-#$sympa_logo_html_definition = '<img src="https://images.domain.org/domain.png" alt="Domain" />'
-#$roundcube_des_key = 'HASHME'
-#$exim_tls_verify_relay_to_domains = 'domain.org : friend.domain.org'
-
-# Puppet configuration
-#$puppetd_configtimeout = 300
-
-# Nagios
-#$nagios_ping_rate = '!300.0,50%!800.0,80%'
-
-# SSL computational DoS mitigation
-#$firewall_global_ssl_ratelimit = 's:ssl:200/min:20'
-
-# Apt configuration
-#$custom_key_dir = 'puppet:///modules/site-apt/keys.d'