Cleanup manifests

diff --git a/config/node/box.example.org.yaml b/config/node/box.example.org.yaml
index 61974095ad5715c71815e1ae52483148ca89d3b8..304d915fece50e7c916f6c476362188853a0cdc0 100644 (file)
--- a/config/node/box.example.org.yaml
+++ b/config/node/box.example.org.yaml
@@ -1,4 +1,16 @@
 ---
+#
+# Nodo
+#
+nodo::role 'vagrant'
+
+#
+# Classes
+#
+classes:
+  - 'database'
+  - 'apache'
+
 #
 # MySQL
 #
@@ -12,3 +24,24 @@ mysql::server::rootpw: '9pRfteNbSFFyrHhackme'
 nodo::subsystem::backup::localhost  : false
 nodo::subsystem::backup::encryptkey : 'none'
 nodo::subsystem::backup::password   : 'hacked'
+
+#
+# Apache
+#
+apache::default_folder : '/vagrant'
+apache::default_user   : 'vagrant'
+apache::default_group  : 'vagrant'
+
+# Manage your app
+apache::sites:
+  myapp:
+    docroot      : "/vagrant/"
+    server_alias : 'myapp vagrant localhost'
+    use          : [ "Site myapp" ]
+    tag          : 'all'
+    owner        : vagrant
+    group        : vagrant
+    mpm_user     : vagrant
+    mpm_group    : vagrant
+    password     : '$5$NZfZqcdyZ3Xt$.kfZejriEJP3fc6RU0gBGEzMPQ/c3XiowVImB6VDrtD'
+    shell        : '/bin/bash'

diff --git a/manifests/bootstrap/configurator.pp b/manifests/bootstrap/configurator.pp
deleted file mode 100644 (file)
index edcbe92..0000000
--- a/manifests/bootstrap/configurator.pp
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# Puppet Bootstrap Configuration Manifest.
-#
-# This file is responsible to set custom configuration in the bootstrap
-# repository for values set in the hiera configuration.
-#
-# This manifest is useful mostly after you cloned the puppet-boostrap module
-# and want to configure it to boostrap a whole puppetmaster infrastructure.
-#
-
-#
-# Basic variables
-#
-$templates              = "$bootstrap_path/templates"
-$base_domain            = hiera('bootstrap::base_domain',                 "${::domain}")
-$first_hostname         = hiera('bootstrap::first_hostname',              "${::hostname}")
-$first_nodes            = hiera('bootstrap::first_nodes',                 'absent')
-$db_password            = hiera('nodo::role::master::db_password',        '')
-$mysql_rootpw           = hiera('mysql::server::rootpw',                  '')
-$root_password          = hiera('bootstrap::root::password',              '')
-$first_user             = hiera('bootstrap::first_user',                  'user')
-$first_user_password    = hiera('bootstrap::first_user::password',        '')
-$first_user_sshkey      = hiera('bootstrap::first_user::sshkey',          '')
-$first_user_email       = hiera('bootstrap::first_user::email',           'user@example.org')
-$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]*')
-
-#
-# Check bootstrap configuration
-#
-
-if ($mysql_rootpw == '') {
-  alert('You must set mysql::server::rootpw at your configuration')
-  fail()
-}
-
-if ($db_password == '') {
-  alert('You must set nodo::role::master::db_password at your configuration')
-  fail()
-}
-
-if ($root_password == '') {
-  alert('You must set bootstrap::root::password at your configuration')
-  fail()
-}
-
-if ($first_user_password == '') {
-  alert('You must set bootstrap::first_user::password at your configuration')
-  fail()
-}
-
-#
-# 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 users
-#
-file { "$bootstrap_path/modules/site_users/manifests/init.pp":
-  ensure  => present,
-  mode    => 0644,
-  content => template("$templates/puppet/users.pp.erb"),
-}
-
-#
-# Site files
-#
-
-file { "$bootstrap_path/modules/site_apache/files/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"),
-}
-
-# First host
-file { "$bootstrap_path/manifests/nodes/$first_hostname.pp":
-  ensure  => $first_nodes,
-  mode    => 0644,
-  content => template("$templates/puppet/server.pp.erb"),
-}
-
-# Master node
-file { "$bootstrap_path/manifests/nodes/$first_hostname-master.pp":
-  ensure  => $first_nodes,
-  mode    => 0644,
-  content => template("$templates/puppet/master.pp.erb"),
-}
-
-# Proxy node
-file { "$bootstrap_path/manifests/nodes/$first_hostname-proxy.pp":
-  ensure  => $first_nodes,
-  mode    => 0644,
-  content => template("$templates/puppet/proxy.pp.erb"),
-}
-
-# Web node
-file { "$bootstrap_path/manifests/nodes/$first_hostname-web.pp":
-  ensure  => $first_nodes,
-  mode    => 0644,
-  content => template("$templates/puppet/web.pp.erb"),
-}
-
-# Storage node
-file { "$bootstrap_path/manifests/nodes/$first_hostname-storage.pp":
-  ensure  => $first_nodes,
-  mode    => 0644,
-  content => template("$templates/puppet/storage.pp.erb"),
-}
-
-# Test node
-file { "$bootstrap_path/manifests/nodes/$first_hostname-test.pp":
-  ensure  => $first_nodes,
-  mode    => 0644,
-  content => template("$templates/puppet/test.pp.erb"),
-}

diff --git a/manifests/bootstrap/host.pp b/manifests/bootstrap/host.pp
deleted file mode 100644 (file)
index 5f9c23a..0000000
--- a/manifests/bootstrap/host.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This manifest is intended to configure the initial
-# machine wich will host the first puppetmaster
-# virtual machine.
-#
-
-# The server role
-class { 'nodo:
-  role => 'server',
-}
-
-# Creates vserver for administrative node
-nodo::vserver::instance { "$hostname-master":
-  context      => '2',
-  puppetmaster => true,
-}
-
-# Create a host entry for this puppet node
-host { "puppet":
-  ensure       => present,
-  ip           => "192.168.0.2",
-  host_aliases => [ "puppet.$domain", "admin" ],
-}

diff --git a/manifests/bootstrap/master.pp b/manifests/bootstrap/master.pp
deleted file mode 100644 (file)
index 5934d3e..0000000
--- a/manifests/bootstrap/master.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This manifest is intended to configure the initial
-# puppetmaster node.
-#
-# Once it's running it can setup all the other nodes.
-#
-
-# Include the master node configuration
-class { 'nodo':
-  role => 'master',
-}

diff --git a/manifests/bootstrap/vagrant.pp b/manifests/bootstrap/vagrant.pp
deleted file mode 100644 (file)
index 47305dc..0000000
--- a/manifests/bootstrap/vagrant.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# This manifest is intended to configure a vagrant
-# virtual machine.
-#
-
-#
-# Class definitions
-#
-
-# Vagrant classes
-class { 'nodo':
-  role => 'vagrant',
-}
-
-#
-# LAMP example
-#
-#include database
-#
-#class { 'apache':
-#  default_folder => '/vagrant',
-#  default_user   => 'vagrant',
-#  default_group  => 'vagrant',
-#}
-#
-# If you want to manage another website
-#apache::site { "myapp":
-#  docroot        => "/vagrant/",
-#  server_alias   => 'myapp vagrant localhost',
-#  use            => [ "Site myapp" ],
-#  tag            => 'all',
-#  owner          => vagrant,
-#  group          => vagrant,
-#  mpm_user       => vagrant,
-#  mpm_group      => vagrant,
-#  password       => '$5$NZfZqcdyZ3Xt$.kfZejriEJP3fc6RU0gBGEzMPQ/c3XiowVImB6VDrtD',
-#  shell          => '/bin/bash',
-#}

diff --git a/manifests/hiera b/manifests/hiera
deleted file mode 120000 (symlink)
index ba8aae1..0000000
--- a/manifests/hiera
+++ /dev/null
@@ -1 +0,0 @@
-../hiera
\ No newline at end of file