correcting paths

diff --git a/manifests/admin_node.pp b/manifests/admin_node.pp
index bc314e9443b32585f43e6e0e621d93e2abcd0e67..22b08fd5cd6fded89cf89d691efe991683dbc358 100644 (file)
--- a/manifests/admin_node.pp
+++ b/manifests/admin_node.pp
@@ -1,5 +1,5 @@
 class admin_node {
-  nodo::vserver::instance { "$host-master":
+  nodo::vserver::instance { "$hostname-master":
     context      => '2',
     puppetmaster => true,
   }

diff --git a/templates/bin/puppet-bootstrap b/templates/bin/puppet-bootstrap
index 70b5da8b640568314504f93a414eac6f5e7a1156..57f5f28a882b6fc286ce6a7058bb179508e25c30 100644 (file)
--- a/templates/bin/puppet-bootstrap
+++ b/templates/bin/puppet-bootstrap
@@ -13,7 +13,7 @@ function add_submodules {
   
   repos="`lynx -dump http://git.sarava.org/?a=project_index | awk '{ print $1 }' | grep ^puppet-`"
   for repo in $repos; do
-    module="`basename $repo .git | cut -d - -f 2`"
+    module="`basename $repo .git | sed -e s/puppet-//`"
     if [ ! -d "modules/$module" ]; then
       git submodule add git://git.sarava.org/puppet-$module.git modules/$module
     fi