summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-13 15:20:02 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-13 15:20:02 +0000
commit6216ae5edf1f71dbc8d0e9da26a109db451f89b3 (patch)
tree68eb369a148fcbeefee4a64ae71aaa699a23069a
parent258651c58f7763896cc876775d23e2b45aea8753 (diff)
downloadpuppet-6216ae5edf1f71dbc8d0e9da26a109db451f89b3.tar.gz
puppet-6216ae5edf1f71dbc8d0e9da26a109db451f89b3.tar.xz
puppet-6216ae5edf1f71dbc8d0e9da26a109db451f89b3.zip
Applying patch from #497 by Jose Gonzalez
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2188 980ebf18-57e1-0310-9a29-db15c13687c0
-rwxr-xr-xconf/gentoo/puppet/puppetca.conf4
-rw-r--r--conf/gentoo/puppet/puppetd.conf4
-rwxr-xr-xconf/gentoo/puppet/puppetmasterd.conf4
3 files changed, 0 insertions, 12 deletions
diff --git a/conf/gentoo/puppet/puppetca.conf b/conf/gentoo/puppet/puppetca.conf
index 1da859505..35f4abf1a 100755
--- a/conf/gentoo/puppet/puppetca.conf
+++ b/conf/gentoo/puppet/puppetca.conf
@@ -11,10 +11,6 @@
# The default value is '$vardir/run'.
rundir = /var/run/puppet
- # Where lock files are kept.
- # The default value is '$vardir/locks'.
- lockdir = /var/lock
-
# Where SSL certificates are kept.
# The default value is '$confdir/ssl'.
ssldir = $vardir/ssl
diff --git a/conf/gentoo/puppet/puppetd.conf b/conf/gentoo/puppet/puppetd.conf
index 1da859505..35f4abf1a 100644
--- a/conf/gentoo/puppet/puppetd.conf
+++ b/conf/gentoo/puppet/puppetd.conf
@@ -11,10 +11,6 @@
# The default value is '$vardir/run'.
rundir = /var/run/puppet
- # Where lock files are kept.
- # The default value is '$vardir/locks'.
- lockdir = /var/lock
-
# Where SSL certificates are kept.
# The default value is '$confdir/ssl'.
ssldir = $vardir/ssl
diff --git a/conf/gentoo/puppet/puppetmasterd.conf b/conf/gentoo/puppet/puppetmasterd.conf
index 1da859505..35f4abf1a 100755
--- a/conf/gentoo/puppet/puppetmasterd.conf
+++ b/conf/gentoo/puppet/puppetmasterd.conf
@@ -11,10 +11,6 @@
# The default value is '$vardir/run'.
rundir = /var/run/puppet
- # Where lock files are kept.
- # The default value is '$vardir/locks'.
- lockdir = /var/lock
-
# Where SSL certificates are kept.
# The default value is '$confdir/ssl'.
ssldir = $vardir/ssl