Adding classes needed by puppetmaster

diff --git a/README.md b/README.md
index a05301a3a1bcbcd1e9206a006c260d9c23b3d464..81000ca6215855b3b7f5efb756395d1587815ede 100644 (file)
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ You'll basically use the `bootstrap` repository as your `puppet` repository:
 
     git clone git://git.sarava.org/puppet-bootstrap.git puppet
     cd puppet && git tag -v
-    make submodules # get all needed submodules
+    make submodules # add all needed puppet moduleas as git submodules
 
 Using as a standalone provisioner
 ---------------------------------
@@ -23,6 +23,6 @@ This will be a `Vagrant` example:
 
     cd your-project
     git clone git://git.sarava.org/puppet-bootstrap.git puppet # use submodule or subtree as you please
-    ln -s puppet/Vagrantfile .                                 # or copy if you want to customize
-    ( cd puppet && mr up )                                     # need the mr binary to download the submodules
+    ln -s puppet/Vagrantfile                                   # or copy if you want to customize
+    ( cd puppet && make modules )                              # need the mr binary to download the submodules
     vagrant up web                                             # with no arguments, all defined VMs are started

diff --git a/TODO.md b/TODO.md
index bc3b32b64a982a2ec2bbe16ba3cd8a34e001dd31..c2130711976b525570e9b69a05c64930a42156d5 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -2,3 +2,4 @@ TODO
 ====
 
 * Make "config" target, refactoring config.pp and default_conf.pp.
+* Make "subtrees" target, including all puppet modules as subtrees.

diff --git a/templates/puppet/websites.pp.erb b/manifests/classes/websites.pp
similarity index 59%
rename from templates/puppet/websites.pp.erb
rename to manifests/classes/websites.pp
index 622c6c918161b2a4a6142dc7ac9ef315aeb716ac..35f27c6a4f44b7ba796b6d16902aaf263fc64d04 100644 (file)
--- a/templates/puppet/websites.pp.erb
+++ b/manifests/classes/websites.pp
@@ -1,6 +1,6 @@
 class websites::admin inherits websites::hosting::admin {
+  # An administrative Trac instance
   #apache::site { "admin":
-  #  ticket         => '64',
   #  docroot        => "${apache::sites_folder}/admin/trac/htdocs",
   #  use            => [ "Trac admin" ],
   #  redirect_match => "trac",
@@ -8,21 +8,20 @@ class websites::admin inherits websites::hosting::admin {
   #  tag            => 'all',
   #}
 
-  #apache::site { "munin":
-  #  ticket         => '153',
-  #  docroot        => '/var/www/munin',
-  #  owner          => "munin",
-  #  group          => "munin",
-  #  mpm            => false,
-  #  tag            => 'all',
-  #}
+  apache::site { "munin":
+    docroot        => '/var/www/munin',
+    owner          => "munin",
+    group          => "munin",
+    mpm            => false,
+    tag            => 'all',
+  }
 
-  #apache::site { "nagios":
-  #  source         => true,
-  #  docroot        => '/usr/share/nagios3/htdocs',
-  #  mpm            => false,
-  #  tag            => 'all',
-  #}
+  apache::site { "nagios":
+    source         => true,
+    docroot        => '/usr/share/nagios3/htdocs',
+    mpm            => false,
+    tag            => 'all',
+  }
 }
 
 class websites inherits websites::hosting {

diff --git a/manifests/modules.pp b/manifests/modules.pp
new file mode 100644 (file)
index 0000000..3df3fe3
--- /dev/null
+++ b/manifests/modules.pp
@@ -0,0 +1,6 @@
+#
+# Module definitions.
+#
+
+# Nodo automatically import all modules we need.
+import "nodo"

diff --git a/manifests/nodes.pp b/manifests/nodes.pp
new file mode 100644 (file)
index 0000000..b90f04e
--- /dev/null
+++ b/manifests/nodes.pp
@@ -0,0 +1,5 @@
+#
+# Node definitions.
+#
+
+#import "nodes/example.pp"

diff --git a/manifests/site.pp b/manifests/site.pp
new file mode 100644 (file)
index 0000000..6f3e5aa
--- /dev/null
+++ b/manifests/site.pp
@@ -0,0 +1,8 @@
+#
+# Puppet site configuration.
+#
+
+import "classes/users.pp"
+import "classes/websites.pp"
+import "modules.pp"
+import "nodes.pp"