summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-06-27 22:58:41 -0400
committerMicah Anderson <micah@riseup.net>2012-06-27 22:58:41 -0400
commitdd380fa91507155d5cfe8ea87023903eb91a18b0 (patch)
tree174526cdd6350bd4f7a325526348d7b58812d098 /README
parentfecafbacbbb820a01d1cc21b6cc69c24f3c60151 (diff)
2.7 underscore rename: site-puppet
Diffstat (limited to 'README')
-rw-r--r--README14
1 files changed, 7 insertions, 7 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',