Renaming stages

diff --git a/README b/README
index 80be0b3d76e1857de8f906d90c93cb0147926992..7df35cf54e4035a9ffcbcd4bb07bf50cba206372 100644 (file)
--- 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/host-stage1.pp b/manifests/host.pp
similarity index 100%
rename from manifests/host-stage1.pp
rename to manifests/host.pp

diff --git a/manifests/admin-stage1.pp b/manifests/master.pp
similarity index 100%
rename from manifests/admin-stage1.pp
rename to manifests/master.pp

diff --git a/manifests/stage0.pp b/manifests/repository.pp
similarity index 100%
rename from manifests/stage0.pp
rename to manifests/repository.pp