View | Details | Raw Unified
Collapse All | Expand All

(-) /etc/init.d/puppetmaster.orig (-9 lines)
 Lines 14-27    Link Here  
		return 1
		return 1
	fi
	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
	return 0

        
}
}

        

  

    

    

       Lines 29-35
       
    
  Link Here 
    

  

        
	checkconfig || return $?
	checkconfig || return $?

        

        
	local options=""
	local options=""

            

              
	[[ -n "${PUPPETMASTER_MANIFEST}" ]]   && options="${options} --manifest=${PUPPETMASTER_MANIFEST}"

              
            

        
	[[ -n "${PUPPETMASTER_LOG}" ]]        && options="${options} --logdest=${PUPPETMASTER_LOG}"
	[[ -n "${PUPPETMASTER_LOG}" ]]        && options="${options} --logdest=${PUPPETMASTER_LOG}"

        
	[[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
	[[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"