From fb4dca646656a3bd5485de859b477b3d5d8800a3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 4 Mar 2014 14:13:22 -0300 Subject: More configurator refactor --- manifests/bootstrap/configurator.pp | 244 ++++++++++++++---------------------- 1 file changed, 93 insertions(+), 151 deletions(-) (limited to 'manifests/bootstrap/configurator.pp') diff --git a/manifests/bootstrap/configurator.pp b/manifests/bootstrap/configurator.pp index cf2d891..ce60731 100644 --- a/manifests/bootstrap/configurator.pp +++ b/manifests/bootstrap/configurator.pp @@ -8,7 +8,9 @@ # and want to configure it to boostrap a whole puppetmaster infrastructure. # +# # Basic variables +# $templates = "$bootstrap_path/templates" $base_domain = hiera('bootstrap::base_domain', 'example.org') $db_password = hiera('nodo::role::master::db_password', 'changeme') @@ -21,7 +23,9 @@ $first_user_email = hiera('bootstrap::first_user::email', 'userm $resolvconf_nameservers = hiera('nodo::subsystem::resolver::nameservers', '201.6.2.152:201.6.2.32') $global_munin_allow = hiera('nodo::munin_node::allow', '192.168.0.[0-9]*') +# # Puppet configuration +# file { "$bootstrap_path/puppet.conf": ensure => present, mode => 0644, @@ -41,23 +45,100 @@ file { "$bootstrap_path/auth.conf": content => template("$templates/puppet/auth.conf.erb"), } -## Basic nodes +# +# Basic users +# +file { "$bootstrap_path/manifests/classes/users.pp": + ensure => present, + mode => 0644, + content => template("$templates/puppet/users.pp.erb"), +} + +# +# Site files +# + +file { "$bootstrap_path/modules/site_apache/htdocs/images/README.html": + ensure => present, + mode => 0644, + content => template("$templates/apache/htdocs/images/README.html.erb"), +} + +file { "$bootstrap_path/modules/site_apache/files/htdocs/index.html": + ensure => present, + mode => 0644, + content => template("$templates/apache/htdocs/index.html.erb"), +} + +file { "$bootstrap_path/modules/site_apache/files/htdocs/missing.html": + ensure => present, + mode => 0644, + content => template("$templates/apache/htdocs/missing.html.erb"), +} + +file { "$bootstrap_path/modules/site_apache/files/vhosts/git": + ensure => present, + mode => 0644, + content => template("$templates/apache/vhosts/git.erb"), +} + +file { "$bootstrap_path/modules/site_apache/files/vhosts/lists": + ensure => present, + mode => 0644, + content => template("$templates/apache/vhosts/lists.erb"), +} + +file { "$bootstrap_path/modules/site_apache/files/vhosts/mail": + ensure => present, + mode => 0644, + content => template("$templates/apache/vhosts/mail.erb"), +} + +file { "$bootstrap_path/modules/site_apache/files/vhosts/nagios": + ensure => present, + mode => 0644, + content => template("$templates/apache/vhosts/nagios.erb"), +} + +file { "$bootstrap_path/modules/site_apache/files/vhosts/wiki": + ensure => present, + mode => 0644, + content => template("$templates/apache/vhosts/wiki.erb"), +} + +file { "$bootstrap_path/modules/site_mail/files/aliases": + ensure => present, + mode => 0644, + content => template("$templates/etc/aliases.erb"), +} + +file { "$bootstrap_path/modules/site_nagios/files/htpasswd.users": + ensure => present, + mode => 0644, + content => template("$templates/etc/nagios3/htpasswd.users.erb"), +} + +file { "$bootstrap_path/modules/site_nginx/files/$domain": + ensure => present, + mode => 0644, + content => template("$templates/etc/nginx/domain.erb"), +} + +file { "$bootstrap_path/modules/site_postfix/files/tls_policy": + ensure => present, + mode => 0644, + content => template("$templates/postfix/tls_policy.erb"), +} + +# +# Basic nodes +# #file { "$bootstrap_path/manifests/nodes.pp": # ensure => present, # mode => 0644, # content => template("$templates/puppet/nodes.pp.erb"), #} -# -## Basic users -#file { "$bootstrap_path/manifests/classes/users.pp": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/manifests/classes"] ], -# content => template("$templates/puppet/users.pp.erb"), -#} -# + ## First host #file { "$bootstrap_path/manifests/nodes/$hostname.pp": # ensure => present, @@ -100,142 +181,3 @@ file { "$bootstrap_path/auth.conf": # content => template("$templates/puppet/test.pp.erb"), #} # -## files in $bootstrap_path/files -#file { [ "$bootstrap_path/files", -# "$bootstrap_path/modules/site_nginx", -# "$bootstrap_path/modules/site_nginx/files", -# "$bootstrap_path/modules/site_nagios", -# "$bootstrap_path/modules/site_nagios/files", -# "$bootstrap_path/modules/site_postfix", -# "$bootstrap_path/modules/site_postfix/files", -# "$bootstrap_path/modules/site_mail", -# "$bootstrap_path/modules/site_mail/files", -# "$bootstrap_path/modules/site_apache", -# "$bootstrap_path/modules/site_apache/files", -# "$bootstrap_path/modules/site_apache/files/vhosts", -# "$bootstrap_path/modules/site_apache/files/htdocs", -# "$bootstrap_path/modules/site_apache/files/htdocs/images", -# "$bootstrap_path/modules/site_keys", -# "$bootstrap_path/modules/site_keys/files", -# "$bootstrap_path/modules/site_keys/files/ssl", ]: -# ensure => directory, -# owner => "puppet", -# group => "puppet", -# mode => 0755, -#} -# -#file { "$bootstrap_path/files/empty": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/files"] ], -#} -# -#file { "$bootstrap_path/modules/site-apache/htdocs/images/README.html": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-apache/files/htdocs/images"] ], -# content => template("$templates/apache/htdocs/images/README.html.erb"), -#} -# -#file { "$bootstrap_path/modules/site-apache/files/htdocs/index.html": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-apache/files/htdocs"] ], -# content => template("$templates/apache/htdocs/index.html.erb"), -#} -# -#file { "$bootstrap_path/modules/site-apache/files/htdocs/missing.html": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-apache/files/htdocs"] ], -# content => template("$templates/apache/htdocs/missing.html.erb"), -#} -# -#file { "$bootstrap_path/modules/site-apache/files/vhosts/git": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-apache/files/vhosts"] ], -# content => template("$templates/apache/vhosts/git.erb"), -#} -# -#file { "$bootstrap_path/modules/site-apache/files/vhosts/lists": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-apache/files/vhosts"] ], -# content => template("$templates/apache/vhosts/lists.erb"), -#} -# -#file { "$bootstrap_path/modules/site-apache/files/vhosts/mail": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-apache/files/vhosts"] ], -# content => template("$templates/apache/vhosts/mail.erb"), -#} -# -#file { "$bootstrap_path/modules/site-apache/files/vhosts/nagios": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-apache/files/vhosts"] ], -# content => template("$templates/apache/vhosts/nagios.erb"), -#} -# -#file { "$bootstrap_path/modules/site-apache/files/vhosts/wiki": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-apache/files/vhosts"] ], -# content => template("$templates/apache/vhosts/wiki.erb"), -#} -# -#file { "$bootstrap_path/modules/site-mail/files/aliases": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-mail/files"] ], -# content => template("$templates/etc/aliases.erb"), -#} -# -#file { "$bootstrap_path/modules/site-nagios/files/htpasswd.users": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-nagios/files"] ], -# content => template("$templates/etc/nagios3/htpasswd.users.erb"), -#} -# -#file { "$bootstrap_path/modules/site-nginx/files/$domain": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-nginx/files"] ], -# content => template("$templates/etc/nginx/domain.erb"), -#} -# -#file { "$bootstrap_path/modules/site-postfix/files/tls_policy": -# ensure => present, -# owner => "puppet", -# group => "puppet", -# mode => 0644, -# require => [ Package["puppet"], File["$bootstrap_path/modules/site-postfix/files"] ], -# content => template("$templates/postfix/tls_policy.erb"), -#} -- cgit v1.2.3