Attachment #167449 for bug #240266




		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
}


	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}"


Return to bug 240266

Lines 14-27 Link Here

(-)/etc/init.d/puppetmaster.orig (-9 lines)
14	return 1	14	return 1
15	fi	15	fi
16		16
17	local site_manifest="/etc/puppet/manifests/site.pp"
18	[[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}"
19
20	if [ ! -f "${site_manifest}" ] ; then
21	eerror "Please create ${site_manifest} before running puppet"
22	return 1
23	fi
24
25	return 0	17	return 0
26	}	18	}
27		19
Lines 29-35 Link Here
29	checkconfig \|\| return $?	21	checkconfig \|\| return $?
30		22
31	local options=""	23	local options=""
32	[[ -n "${PUPPETMASTER_MANIFEST}" ]] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}"
33	[[ -n "${PUPPETMASTER_LOG}" ]] && options="${options} --logdest=${PUPPETMASTER_LOG}"	24	[[ -n "${PUPPETMASTER_LOG}" ]] && options="${options} --logdest=${PUPPETMASTER_LOG}"
34	[[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"	25	[[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
35		26