Attachment #345774 for bug #466234




	all_fakegem_install

	newinitd "${FILESDIR}"/puppet.init-r1 puppet
	doconfd conf/gentoo/conf.d/puppet

	# Initial configuration files
	insinto /etc/puppet
	# Bug #338439
	#doins conf/gentoo/puppet/*
	#doins conf/redhat/puppet.conf
	doins "${FILESDIR}"/puppet.conf

	# Location of log and data files
	keepdir /var/{run,log}/puppet

	else
		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
		newconfd "${FILESDIR}"/puppet.confd puppet

		insinto /etc/puppet
		doins conf/redhat/fileserver.conf

Return to bug 466234

Lines 84-96 Link Here

(-)/usr/portage/app-admin/puppet/puppet-2.7.21.ebuild (-2 / +3 lines)
84	all_fakegem_install	84	all_fakegem_install
85		85
86	newinitd "${FILESDIR}"/puppet.init-r1 puppet	86	newinitd "${FILESDIR}"/puppet.init-r1 puppet
87	doconfd conf/gentoo/conf.d/puppet
88		87
89	# Initial configuration files	88	# Initial configuration files
90	insinto /etc/puppet	89	insinto /etc/puppet
91	# Bug #338439	90	# Bug #338439
92	#doins conf/gentoo/puppet/*	91	#doins conf/gentoo/puppet/*
93	doins conf/redhat/puppet.conf	92	#doins conf/redhat/puppet.conf
		93	doins "${FILESDIR}"/puppet.conf
94		94
95	# Location of log and data files	95	# Location of log and data files
96	keepdir /var/{run,log}/puppet	96	keepdir /var/{run,log}/puppet
Lines 102-107 Link Here
102	else	102	else
103	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster	103	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
104	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster	104	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
		105	newconfd "${FILESDIR}"/puppet.confd puppet
105		106
106	insinto /etc/puppet	107	insinto /etc/puppet
107	doins conf/redhat/fileserver.conf	108	doins conf/redhat/fileserver.conf