Initial config target

2 files changed, 232 insertions, 296 deletions

diff --git a/manifests/classes/configurator.pp b/manifests/classes/configurator.pp
new file mode 100644
index 0000000..d0dd787
--- /dev/null
+++ b/manifests/classes/configurator.pp
@@ -0,0 +1,232 @@
+#
+# Puppet Bootstrap Configuration Manifest
+#
+# This file is responsible to set custom configuration in the bootstrap
+# repository for values set in the hiera configuration.
+#
+# While this manifest can be run many times, it's useful mostly after you
+# cloned the puppet-boostrap module and want to configure it to boostrap a
+# whole puppetmaster infrastructure.
+#
+
+# Variables
+$templates = "$bootstrap_path/templates"
+
+# Puppet configuration
+file { "$bootstrap_path/puppet.conf":
+  ensure  => present,
+  mode    => 0644,
+  content => template("$templates/puppet/puppet.conf.erb"),
+}
+
+# Fileserver configuration
+file { "$bootstrap_path/fileserver.conf":
+  ensure  => present,
+  mode    => 0644,
+  content => template("$templates/puppet/fileserver.conf.erb"),
+}
+
+file { "$bootstrap_path/auth.conf":
+  ensure  => present,
+  mode    => 0644,
+  content => template("$templates/puppet/auth.conf.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,
+#  mode    => 0644,
+#  content => template("$templates/puppet/server.pp.erb"),
+#}
+#
+## Master node
+#file { "$bootstrap_path/manifests/nodes/$hostname-master.pp":
+#  ensure  => present,
+#  mode    => 0644,
+#  content => template("$templates/puppet/master.pp.erb"),
+#}
+#
+## Proxy node
+#file { "$bootstrap_path/manifests/nodes/$hostname-proxy.pp":
+#  ensure  => present,
+#  mode    => 0644,
+#  content => template("$templates/puppet/proxy.pp.erb"),
+#}
+#
+## Web node
+#file { "$bootstrap_path/manifests/nodes/$hostname-web.pp":
+#  ensure  => present,
+#  mode    => 0644,
+#  content => template("$templates/puppet/web.pp.erb"),
+#}
+#
+## Storage node
+#file { "$bootstrap_path/manifests/nodes/$hostname-storage.pp":
+#  ensure  => present,
+#  mode    => 0644,
+#  content => template("$templates/puppet/storage.pp.erb"),
+#}
+#
+## Test node
+#file { "$bootstrap_path/manifests/nodes/$hostname-test.pp":
+#  ensure  => present,
+#  mode    => 0644,
+#  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"),
+#}
diff --git a/manifests/classes/default_conf.pp b/manifests/classes/default_conf.pp
deleted file mode 100644
index ab8280d..0000000
--- a/manifests/classes/default_conf.pp
+++ /dev/null
@@ -1,296 +0,0 @@
-class default_conf {
-
-  $templates_dir           = "$puppet_bootstrap_tmpdir/templates"
-  $default_puppet_conf_dir = "$puppet_dir/default-conf"
-
-  # directories
-  file { ["$puppet_dir", "$default_puppet_conf_dir"]:
-    ensure  => directory,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0755,
-    require => Package["puppet"],
-  }
-
-  file { [ "$default_puppet_conf_dir/files",
-           "$default_puppet_conf_dir/manifests",
-           "$default_puppet_conf_dir/modules",
-           "$default_puppet_conf_dir/manifests/classes",
-           "$default_puppet_conf_dir/manifests/nodes" ]:
-    ensure  => directory,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0755,
-    require => File["$default_puppet_conf_dir"],
-  }
-
-  # files in $default_puppet_conf_dir
-  file { "$default_puppet_conf_dir/puppet.conf":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => Package["puppet"],
-    content => template("$templates_dir/puppet/puppet.conf.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/fileserver.conf":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => Package["puppet"],
-    content => template("$templates_dir/puppet/fileserver.conf.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/auth.conf":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => Package["puppet"],
-    content => template("$templates_dir/puppet/auth.conf.erb"),
-  }
-
-  # files in $default_puppet_conf_dir/manifests
-  file { "$default_puppet_conf_dir/manifests/site.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests"] ],
-    content => template("$templates_dir/puppet/site.pp.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/manifests/modules.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests"] ],
-    content => template("$templates_dir/puppet/modules.pp.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/manifests/nodes.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests"] ],
-    content => template("$templates_dir/puppet/nodes.pp.erb"),
-  }
-
-  # files in $default_puppet_conf_dir/manifests/classes
-  file { "$default_puppet_conf_dir/manifests/classes/websites.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/classes"] ],
-    content => template("$templates_dir/puppet/websites.pp.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/manifests/classes/users.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/classes"] ],
-    content => template("$templates_dir/puppet/users.pp.erb"),
-  }
-
-  # files in $default_puppet_conf_dir/manifests/nodes
-  file { "$default_puppet_conf_dir/manifests/nodes/$hostname.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-    content => template("$templates_dir/puppet/server.pp.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/manifests/nodes/$hostname-master.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-    content => template("$templates_dir/puppet/master.pp.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/manifests/nodes/$hostname-proxy.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-    content => template("$templates_dir/puppet/proxy.pp.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/manifests/nodes/$hostname-web.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-    content => template("$templates_dir/puppet/web.pp.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/manifests/nodes/$hostname-storage.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-    content => template("$templates_dir/puppet/storage.pp.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/manifests/nodes/$hostname-test.pp":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/manifests/nodes"] ],
-    content => template("$templates_dir/puppet/test.pp.erb"),
-  }
-
-  # files in $default_puppet_conf_dir/files
-  file { [ "$default_puppet_conf_dir/files",
-           "$default_puppet_conf_dir/modules/site_nginx",
-           "$default_puppet_conf_dir/modules/site_nginx/files",
-           "$default_puppet_conf_dir/modules/site_nagios",
-           "$default_puppet_conf_dir/modules/site_nagios/files",
-           "$default_puppet_conf_dir/modules/site_postfix",
-           "$default_puppet_conf_dir/modules/site_postfix/files",
-           "$default_puppet_conf_dir/modules/site_mail",
-           "$default_puppet_conf_dir/modules/site_mail/files",
-           "$default_puppet_conf_dir/modules/site_apache",
-           "$default_puppet_conf_dir/modules/site_apache/files",
-           "$default_puppet_conf_dir/modules/site_apache/files/vhosts",
-           "$default_puppet_conf_dir/modules/site_apache/files/htdocs",
-           "$default_puppet_conf_dir/modules/site_apache/files/htdocs/images",
-           "$default_puppet_conf_dir/modules/site_keys",
-           "$default_puppet_conf_dir/modules/site_keys/files",
-           "$default_puppet_conf_dir/modules/site_keys/files/ssl", ]:
-    ensure  => directory,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0755,
-  }
-
-  file { "$default_puppet_conf_dir/files/empty":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files"] ],
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-apache/htdocs/images/README.html":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/htdocs/images"] ],
-    content => template("$templates_dir/apache/htdocs/images/README.html.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-apache/files/htdocs/index.html":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/htdocs"] ],
-    content => template("$templates_dir/apache/htdocs/index.html.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-apache/files/htdocs/missing.html":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/htdocs"] ],
-    content => template("$templates_dir/apache/htdocs/missing.html.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/git":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
-    content => template("$templates_dir/apache/vhosts/git.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/lists":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
-    content => template("$templates_dir/apache/vhosts/lists.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/mail":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
-    content => template("$templates_dir/apache/vhosts/mail.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/nagios":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
-    content => template("$templates_dir/apache/vhosts/nagios.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/wiki":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
-    content => template("$templates_dir/apache/vhosts/wiki.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-mail/files/aliases":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-mail/files"] ],
-    content => template("$templates_dir/etc/aliases.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-nagios/files/htpasswd.users":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-nagios/files"] ],
-    content => template("$templates_dir/etc/nagios3/htpasswd.users.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-nginx/files/$domain":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-nginx/files"] ],
-    content => template("$templates_dir/etc/nginx/domain.erb"),
-  }
-
-  file { "$default_puppet_conf_dir/modules/site-postfix/files/tls_policy":
-    ensure  => present,
-    owner   => "puppet",
-    group   => "puppet",
-    mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-postfix/files"] ],
-    content => template("$templates_dir/postfix/tls_policy.erb"),
-  }
-}