From 1dbfb411962d22b3f61fb9ec2696879bb9a62ca4 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 27 Oct 2013 20:38:15 -0200
Subject: Renaming stages

---
 README                    | 19 +++++++++++++------
 manifests/admin-stage1.pp | 13 -------------
 manifests/host-stage1.pp  | 17 -----------------
 manifests/host.pp         | 17 +++++++++++++++++
 manifests/master.pp       | 13 +++++++++++++
 manifests/repository.pp   |  9 +++++++++
 manifests/stage0.pp       |  9 ---------
 7 files changed, 52 insertions(+), 45 deletions(-)
 delete mode 100644 manifests/admin-stage1.pp
 delete mode 100644 manifests/host-stage1.pp
 create mode 100644 manifests/host.pp
 create mode 100644 manifests/master.pp
 create mode 100644 manifests/repository.pp
 delete mode 100644 manifests/stage0.pp

diff --git a/README b/README
index 80be0b3..7df35cf 100644
--- a/README
+++ b/README
@@ -10,15 +10,22 @@ http://git.sarava.org. Check the code for the full dependency list.
 Bootstrap sequence
 ------------------
 
-In Debian, run the following as super user to bootstrap:
+In Debian, run the following as super user:
 
   apt-get update
-  apt-get install puppet puppetmaster git-core
-  /etc/init.d/puppetmaster stop
-  apt-get install git
+  apt-get install puppet git
   mkdir -p /etc/puppet/modules
   git clone git://git.sarava.org/puppet-bootstrap /etc/puppet/modules/bootstrap
-  # edit /etc/puppet/modules/bootstrap/manifests/init.pp to suit your needs.
-  puppet apply --debug --verbose /etc/puppet/modules/bootstrap/manifests/init.pp
+  $EDITOR /etc/puppet/modules/bootstrap/manifests/init.pp # to suit your needs.
+  puppet apply --debug --verbose /etc/puppet/modules/bootstrap/manifests/repository.pp
   puppet agent --no-daemonize --debug --verbose --onetime
 
+Then, to bootstrap the master node:
+
+  puppet apply --debug --verbose /etc/puppet/modules/bootstrap/manifests/master.pp
+  puppet agent --no-daemonize --debug --verbose --onetime
+
+Alternativelly, if you want to to bootstrap the host:
+
+  puppet apply --debug --verbose /etc/puppet/modules/bootstrap/manifests/host.pp
+  puppet agent --no-daemonize --debug --verbose --onetime
diff --git a/manifests/admin-stage1.pp b/manifests/admin-stage1.pp
deleted file mode 100644
index 4aa3806..0000000
--- a/manifests/admin-stage1.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-import "config.pp"
-import "nodo"
-
-include git
-
-# puppet config
-package { [ "puppet", "puppetmaster" ]: ensure => installed, }
-
-service { "puppetmaster":
-  ensure  => stopped,
-  require => Package["puppetmaster"]
-}
-
diff --git a/manifests/host-stage1.pp b/manifests/host-stage1.pp
deleted file mode 100644
index 179dda8..0000000
--- a/manifests/host-stage1.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-import "config.pp"
-import "nodo"
-import "classes/admin_node.pp"
-import "classes/firewall.pp"
-import "classes/users.pp"
-import "classes/default_conf.pp"
-
-include nodo::server
-
-# creates vserver for administrative node
-include admin_node
-
-# creates firewall rules for administrative node's external acess
-include firewall
-
-# creates a default puppet configuration in /usr/local/puppet/default-conf
-include default_conf
diff --git a/manifests/host.pp b/manifests/host.pp
new file mode 100644
index 0000000..179dda8
--- /dev/null
+++ b/manifests/host.pp
@@ -0,0 +1,17 @@
+import "config.pp"
+import "nodo"
+import "classes/admin_node.pp"
+import "classes/firewall.pp"
+import "classes/users.pp"
+import "classes/default_conf.pp"
+
+include nodo::server
+
+# creates vserver for administrative node
+include admin_node
+
+# creates firewall rules for administrative node's external acess
+include firewall
+
+# creates a default puppet configuration in /usr/local/puppet/default-conf
+include default_conf
diff --git a/manifests/master.pp b/manifests/master.pp
new file mode 100644
index 0000000..4aa3806
--- /dev/null
+++ b/manifests/master.pp
@@ -0,0 +1,13 @@
+import "config.pp"
+import "nodo"
+
+include git
+
+# puppet config
+package { [ "puppet", "puppetmaster" ]: ensure => installed, }
+
+service { "puppetmaster":
+  ensure  => stopped,
+  require => Package["puppetmaster"]
+}
+
diff --git a/manifests/repository.pp b/manifests/repository.pp
new file mode 100644
index 0000000..b148933
--- /dev/null
+++ b/manifests/repository.pp
@@ -0,0 +1,9 @@
+import "config.pp"
+import "classes/puppet_bootstrap.pp"
+
+# setup modules for use with other stages
+include puppet_bootstrap
+
+puppet_bootstrap::puppet_modules{ "modules":
+  puppet_dir => "$puppet_bootstrap_tmpdir",
+}
diff --git a/manifests/stage0.pp b/manifests/stage0.pp
deleted file mode 100644
index b148933..0000000
--- a/manifests/stage0.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-import "config.pp"
-import "classes/puppet_bootstrap.pp"
-
-# setup modules for use with other stages
-include puppet_bootstrap
-
-puppet_bootstrap::puppet_modules{ "modules":
-  puppet_dir => "$puppet_bootstrap_tmpdir",
-}
-- 
cgit v1.2.3