puppet.conf on the clients:

----------
[main]

    # Where Puppet stores dynamic and growing data.
    # The default value is '/var/puppet'.
    vardir = /var/lib/puppet

    # The Puppet log directory.
    # The default value is '$vardir/log'.
    logdir = /var/log/puppet

    # Where Puppet PID files are kept.
    # The default value is '$vardir/run'.
    rundir = /var/run/puppet

    # Where SSL certificates are kept.
    # The default value is '$confdir/ssl'.
    ssldir = $vardir/ssl

    pluginsync = true
    factpath = $vardir/lib/facter

[puppetd]
    # The file in which puppetd stores a list of the classes
    # associated with the retrieved configuratiion.  Can be loaded in
    # the separate ``puppet`` executable using the ``--loadclasses``
    # option.
    # The default value is '$confdir/classes.txt'.
    classfile = $vardir/classes.txt

    # Where puppetd caches the local configuration.  An
    # extension indicating the cache format is added automatically.
    # The default value is '$confdir/localconfig'.
    localconfig = $vardir/localconfig
-----------

puppet.conf on the puppetmaster:
-----------
[main]
    templatedir = /etc/puppet/templates

    # Where Puppet stores dynamic and growing data.
    # The default value is '/var/puppet'.
    vardir = /var/lib/puppet

    # The Puppet log directory.
    # The default value is '$vardir/log'.
    logdir = /var/log/puppet

    # Where Puppet PID files are kept.
    # The default value is '$vardir/run'.
    rundir = /var/run/puppet

    # Where SSL certificates are kept.
    # The default value is '$confdir/ssl'.
    ssldir = $vardir/ssl

    pluginsync = true
[puppetd]
    # The file in which puppetd stores a list of the classes
    # associated with the retrieved configuratiion.  Can be loaded in
    # the separate ``puppet`` executable using the ``--loadclasses``
    # option.
    # The default value is '$confdir/classes.txt'.
    classfile = $vardir/classes.txt

    # Where puppetd caches the local configuration.  An
    # extension indicating the cache format is added automatically.
    # The default value is '$confdir/localconfig'.
    localconfig = $vardir/localconfig

[puppetmasterd]
#storeconfigs=true
dbadapter=mysql
dbuser=puppet
dbpassword=
dbserver=localhost
#dbsocket=/var/run/mysqld/mysqld.sock
Certname=puppet
-----------

fileserver.conf on the puppetmaster:
-----------
# This file consists of arbitrarily named sections/modules
# defining where files are served from and to whom

# Define a section 'files'
# Adapt the allow/deny settings to your needs. Order
# for allow/deny does not matter, allow always takes precedence
# over deny

[plugins]
allow 192.168.0.0/24
allow 192.168.1.0/24
allow 192.168.20.0/24
allow 192.168.246.0/24
allow 213.152.0.0/16

[scripts]
path /etc/puppet/scripts
allow 192.168.0.0/24
allow 192.168.1.0/24
allow 192.168.20.0/24
allow 192.168.246.0/24
allow 213.152.0.0/16

[keys]
path /etc/puppet/keys
allow 192.168.0.0/24
allow 192.168.1.0/24
allow 192.168.20.0/24
allow 192.168.246.0/24
allow 213.152.0.0/16

[fonts]
path /etc/puppet/fonts
allow 192.168.0.0/24
allow 192.168.1.0/24
allow 192.168.20.0/24
allow 192.168.246.0/24
allow 213.152.0.0/16

[files]
path /etc/puppet/files
allow 192.168.0.0/24
allow 192.168.1.0/24
allow 192.168.20.0/24
allow 192.168.246.0/24
allow 213.152.0.0/16
-----------