projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
files
/
etc
/
default
/
puppet
diff --git
a/files/etc/default/puppet
b/files/etc/default/puppet
index
3dcfa06
..
dc0743f
100644
(file)
--- a/
files/etc/default/puppet
+++ b/
files/etc/default/puppet
@@
-1,7
+1,13
@@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
# Defaults for puppet - sourced by /etc/init.d/puppet
# Start puppet on boot?
# Defaults for puppet - sourced by /etc/init.d/puppet
# Start puppet on boot?
-START=yes
+START=no
+exit 0
# Startup options
DAEMON_OPTS="-w 5 --factsync"
# Startup options
DAEMON_OPTS="-w 5 --factsync"