2.7 underscore rename: site-puppet

9 files changed, 28 insertions, 28 deletions

diff --git a/README b/README
index 3c71a5f..ea07f0a 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 Puppet-Module for configuring Puppet itself, both the master and the clients
 ============================================================================
 
-Use a seperate local module called "site-puppet", where you place your customized 
+Use a seperate local module called "site_puppet", where you place your customized 
 files, under:
- site-puppet/files/master/fileserver.conf
- site-puppet/files/master/puppet.conf
+ site_puppet/files/master/fileserver.conf
+ site_puppet/files/master/puppet.conf
 
 Usage
 =====
@@ -95,7 +95,7 @@ $puppet_storeconfig_password to the puppet database password, and then set
 $puppetmaster_storeconfigs = true to enable stored configs. 
 
 Then you will need to either put in your node definition, or in
-site-puppet/manifests/init.pp puppet::puppetmaster::hasdb to setup the database
+site_puppet/manifests/init.pp puppet::puppetmaster::hasdb to setup the database
 with the right parameters. This will setup your storeconfigs database, adding to
 the database the correct user, the correct grant permissions, and also setup
 a munin graph, if you have $use_munin = true
@@ -115,14 +115,14 @@ node puppetmaster {
   $use_munin = true
   $puppetmaster_mode = 'passenger'
   $puppet_crontime = "0,12 * * * *"
-  include site-puppet::master
+  include site_puppet::master
   include puppet::cron
   include puppet::puppetmaster
 ...
 
-in your site-puppet/manifests/master.pp you could include something like:
+in your site_puppet/manifests/master.pp you could include something like:
 
-class site-puppet::master {
+class site_puppet::master {
       ...
       puppet::puppetmaster::hasdb { "puppet":
         dbname => 'puppetmaster',
diff --git a/manifests/base.pp b/manifests/base.pp
index 695241c..6ff8fa5 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -20,9 +20,9 @@ class puppet::base {
 
   file { 'puppet_config':
     path => "$puppet_config",
-    source => [ "puppet:///modules/site-puppet/client/${fqdn}/puppet.conf",
-                "puppet:///modules/site-puppet/client/puppet.conf.$operatingsystem",
-                "puppet:///modules/site-puppet/client/puppet.conf",
+    source => [ "puppet:///modules/site_puppet/client/${fqdn}/puppet.conf",
+                "puppet:///modules/site_puppet/client/puppet.conf.$operatingsystem",
+                "puppet:///modules/site_puppet/client/puppet.conf",
                 "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf.$operatingsystem",
                 "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf",
                 "puppet:///modules/puppet/client/puppet.conf.$operatingsystem",
diff --git a/manifests/centos.pp b/manifests/centos.pp
index 61aa065..d98f422 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -1,9 +1,9 @@
 class puppet::centos inherits puppet::linux {
 
   file { '/etc/sysconfig/puppet':
-    source => [ "puppet:///modules/site-puppet/sysconfig/${fqdn}/puppet",
-                "puppet:///modules/site-puppet/sysconfig/${domain}/puppet",
-                "puppet:///modules/site-puppet/sysconfig/puppet",
+    source => [ "puppet:///modules/site_puppet/sysconfig/${fqdn}/puppet",
+                "puppet:///modules/site_puppet/sysconfig/${domain}/puppet",
+                "puppet:///modules/site_puppet/sysconfig/puppet",
                 "puppet:///modules/puppet/sysconfig/puppet" ],
     notify => Service[puppet],
     owner => root, group => 0, mode => 0644;
diff --git a/manifests/debian.pp b/manifests/debian.pp
index f0479ae..e0cf4bc 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,9 +1,9 @@
 class puppet::debian inherits puppet::linux {
 
   file { '/etc/default/puppet':
-    source => [ "puppet:///modules/site-puppet/client/debian/${fqdn}/puppet",
-                "puppet:///modules/site-puppet/client/debian/${domain}/puppet",
-                "puppet:///modules/site-puppet/client/debian/puppet",
+    source => [ "puppet:///modules/site_puppet/client/debian/${fqdn}/puppet",
+                "puppet:///modules/site_puppet/client/debian/${domain}/puppet",
+                "puppet:///modules/site_puppet/client/debian/puppet",
                 "puppet:///modules/puppet/client/debian/puppet" ],
     notify => Service[puppet],
     owner => root, group => 0, mode => 0644;
diff --git a/manifests/linux.pp b/manifests/linux.pp
index 13788ef..d17b386 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -15,7 +15,7 @@ class puppet::linux inherits puppet::base {
   }
   
   file { '/etc/cron.d/puppetd.cron':
-    source => [ "puppet:///modules/site-puppet/cron.d/puppetd",
+    source => [ "puppet:///modules/site_puppet/cron.d/puppetd",
                 "puppet:///modules/puppet/cron.d/puppetd.${operatingsystem}",
                 "puppet:///modules/puppet/cron.d/puppetd" ],
     owner => root, group => 0, mode => 0644,
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp
index a7dc7a5..a313ff2 100644
--- a/manifests/puppetmaster/base.pp
+++ b/manifests/puppetmaster/base.pp
@@ -2,8 +2,8 @@ class puppet::puppetmaster::base inherits puppet::base {
 
   File[puppet_config]{
     source => [
-                "puppet:///modules/site-puppet/master/${fqdn}/puppet.conf",
-                "puppet:///modules/site-puppet/master/puppet.conf",
+                "puppet:///modules/site_puppet/master/${fqdn}/puppet.conf",
+                "puppet:///modules/site_puppet/master/puppet.conf",
                 "puppet:///modules/puppet/master/puppet.conf",
     ],
   }
@@ -11,8 +11,8 @@ class puppet::puppetmaster::base inherits puppet::base {
   if !$puppet_fileserverconfig { $puppet_fileserverconfig  = "${puppet::default_config_dir}/fileserver.conf" }
 
   file { "$puppet_fileserverconfig":
-    source => [ "puppet:///modules/site-puppet/master/${fqdn}/fileserver.conf",
-                "puppet:///modules/site-puppet/master/fileserver.conf",
+    source => [ "puppet:///modules/site_puppet/master/${fqdn}/fileserver.conf",
+                "puppet:///modules/site_puppet/master/fileserver.conf",
                 "puppet:///modules/puppet/master/fileserver.conf" ],
     owner => root, group => puppet, mode => 640;
   }
diff --git a/manifests/puppetmaster/centos.pp b/manifests/puppetmaster/centos.pp
index 2673a4d..a6f5e23 100644
--- a/manifests/puppetmaster/centos.pp
+++ b/manifests/puppetmaster/centos.pp
@@ -2,9 +2,9 @@
 class puppet::puppetmaster::centos inherits puppet::puppetmaster::package {
 
   file { '/etc/sysconfig/puppetmaster':
-    source => [ "puppet:///modules/site-puppet/sysconfig/${fqdn}/puppetmaster",
-                "puppet:///modules/site-puppet/sysconfig/${domain}/puppetmaster",
-                "puppet:///modules/site-puppet/sysconfig/puppetmaster",
+    source => [ "puppet:///modules/site_puppet/sysconfig/${fqdn}/puppetmaster",
+                "puppet:///modules/site_puppet/sysconfig/${domain}/puppetmaster",
+                "puppet:///modules/site_puppet/sysconfig/puppetmaster",
                 "puppet:///modules/puppet/sysconfig/puppetmaster" ],
     notify => Service[puppetmaster],
     owner => root, group => 0, mode => 0644;
diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp
index a7d7f0a..0c81a64 100644
--- a/manifests/puppetmaster/debian.pp
+++ b/manifests/puppetmaster/debian.pp
@@ -13,9 +13,9 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package {
   }
   
   file { '/etc/default/puppetmaster':
-    source => [ "puppet:///modules/site-puppet/master/debian/${fqdn}/puppetmaster",
-                "puppet:///modules/site-puppet/master/debian/${domain}/puppetmaster",
-                "puppet:///modules/site-puppet/master/debian/puppetmaster",
+    source => [ "puppet:///modules/site_puppet/master/debian/${fqdn}/puppetmaster",
+                "puppet:///modules/site_puppet/master/debian/${domain}/puppetmaster",
+                "puppet:///modules/site_puppet/master/debian/puppetmaster",
                 "puppet:///modules/puppet/master/debian/puppetmaster" ],
     notify => $puppetmaster_default_nofity ? {
     '' => Service[puppetmaster],
diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp
index c4bc062..584a559 100644
--- a/manifests/puppetmaster/passenger.pp
+++ b/manifests/puppetmaster/passenger.pp
@@ -13,7 +13,7 @@ class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base {
       owner => root, group => 0, mode => 0755;
 
     '/etc/puppet/rack/config.ru':
-      source => [ "puppet:///modules/site-puppet/master/config.ru",
+      source => [ "puppet:///modules/site_puppet/master/config.ru",
                   "puppet:///modules/puppet/master/config.ru" ],
       owner => puppet, group => 0, mode => 0644;
   }