Renaming the puppet module that ships with the everest-repo RPM

This is simply to avoid the conflict with the current everest puppet module we
have.  We're in the process of clean that up.

I'm also pushing the latest docs

2 files changed, 13 insertions, 13 deletions

diff --git a/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp b/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp
index f9c9230..7df9611 100644
--- a/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp
+++ b/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp
@@ -113,7 +113,7 @@ class everest {
 
         file { "${puppetdir}/puppet.conf":
             mode        => 0644,
-            content     => template("everest/puppet.conf.erb"),
+            content     => template("everestrepo/puppet.conf.erb"),
             require     => Package["puppet"],
         }
 
@@ -144,7 +144,7 @@ class everest {
             mode        => 0755,
             owner       => puppet,
             group       => puppet,
-            source      => "puppet:///everest/puppet_node.sh",
+            source      => "puppet:///everestrepo/puppet_node.sh",
             notify      => Service["puppetmaster"],
             before      => File["${puppetdir}/puppet.conf"],
         }
@@ -161,7 +161,7 @@ class everest {
 
         define puppet::file {
             file {"${puppetdir}/${name}":
-                source  => "puppet:///everest/${name}",
+                source  => "puppet:///everestrepo/${name}",
                 before  => [Service["puppetmaster"], File["${puppetdir}/puppet.conf"]],
                 require => Package["puppet-server"],
 	    }
@@ -199,7 +199,7 @@ class everest {
              group       => "root",
              ensure      => present,
              mode        => 0660,
-             source      => "puppet:///everest/users.digest",
+             source      => "puppet:///everestrepo/users.digest",
              require     => Package["cobbler"],
         }
 
@@ -208,7 +208,7 @@ class everest {
              group       => "root",
              ensure      => present,
              mode        => 0664,
-             content     => template("everest/settings.erb"),
+             content     => template("everestrepo/settings.erb"),
              require     => Package["cobbler"],
              notify      => Service["cobblerd"],
         }
@@ -218,7 +218,7 @@ class everest {
              group       => "root",
              ensure      => present,
              mode        => 0664,
-             source      => "puppet:///everest/modules.conf",
+             source      => "puppet:///everestrepo/modules.conf",
              require     => Package["cobbler"],
              notify      => Service["cobblerd"],
         }
@@ -283,7 +283,7 @@ class everest {
              owner     => "root", 
              group     => "root", 
              mode      => 0644, 
-             source    => "puppet:///everest/machine_types.rb",
+             source    => "puppet:///everestrepo/machine_types.rb",
         }
  
         file { "/etc/everest/bootstap.pp":
@@ -291,7 +291,7 @@ class everest {
              owner     => "root", 
              group     => "root", 
              mode      => 0644, 
-             source    => "puppet:///everest/bootstrap.pp",
+             source    => "puppet:///everestrepo/bootstrap.pp",
         }
 
         # This allows all users to run puppetca --clean
@@ -300,7 +300,7 @@ class everest {
             owner       => "root",
             group       => "root",
             mode        => 0440,
-            content     => template("everest/sudoers.erb"),
+            content     => template("everestrepo/sudoers.erb"),
             require     => User["$user"],
         }
 
@@ -316,7 +316,7 @@ class everest {
                 ensure      => present,
                 mode        => 0755,
                 require     => Service["httpd"],
-                source      => "puppet:///everest/${name}",
+                source      => "puppet:///everestrepo/${name}",
             }
         }
     }
diff --git a/everest-repo/everest-repo.spec b/everest-repo/everest-repo.spec
index e897ca3..628031a 100644
--- a/everest-repo/everest-repo.spec
+++ b/everest-repo/everest-repo.spec
@@ -1,6 +1,6 @@
 Name:           everest-repo
 Version:        1.0.0
-Release:        14%{?dist}
+Release:        16%{?dist}
 Summary:        Everest repository 
 
 Group:          Applications/System
@@ -50,7 +50,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
 
 cp -r docs/tmp/* $RPM_BUILD_ROOT/pub/docs/everest
 
-cp -r everest_module $RPM_BUILD_ROOT/etc/puppet/modules/everest
+cp -r everest_module $RPM_BUILD_ROOT/etc/puppet/modules/everestrepo
 
 cp everest_module/files/repo.yaml $RPM_BUILD_ROOT/etc/everest
 cp everest_module/files/machine_types.rb $RPM_BUILD_ROOT/etc/everest
@@ -67,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 /etc/httpd/conf.d/docs.conf
-/etc/puppet/modules/everest
+/etc/puppet/modules/everestrepo
 /etc/everest/bootstrap.pp
 /pub/docs
 %config(noreplace) /etc/everest/repo.yaml