--- /etc/init.d/puppetmaster.orig 2008-10-06 15:09:24.000000000 +0200 +++ /etc/init.d/puppetmaster 2008-10-06 15:12:26.000000000 +0200 @@ -14,14 +14,6 @@ return 1 fi - local site_manifest="/etc/puppet/manifests/site.pp" - [[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}" - - if [ ! -f "${site_manifest}" ] ; then - eerror "Please create ${site_manifest} before running puppet" - return 1 - fi - return 0 } @@ -29,7 +21,6 @@ checkconfig || return $? local options="" - [[ -n "${PUPPETMASTER_MANIFEST}" ]] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}" [[ -n "${PUPPETMASTER_LOG}" ]] && options="${options} --logdest=${PUPPETMASTER_LOG}" [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"