240266 2008-10-06 13:25 0000 app-admin/puppet-0.24.5-r1: Remove PUPPETMASTER_MANIFEST from startup scripts 2008-10-06 16:29:34 0000 1 1 1 Unclassified Gentoo Linux Ebuilds unspecified All Linux RESOLVED FIXED P2 normal --- 1 kc@gocept.com matsuu@gentoo.org kc@gocept.com 2008-10-06 13:25:10 0000 The Gentoo puppetmaster initscripts use PUPPETMASTER_MANIFEST, which overrides the manifest location at puppetmaster's startup via command line. Although this may present an easy guide for initial setup, it is conceptually incompatible with puppet environments. With puppet environments, one can specify different manifests (and everything else) using separate sections in /etc/puppet/puppet.conf. This allows for example to distinguish development and production configurations. But when a --manifest command line argument is prenent during puppetmaster startup, the manifest is fixed to the parameter for all environments. Therefor, I suggest to drop PUPPETMASTER_MANIFEST and --manifest from /etc/conf.d/puppetmaster and /etc/init.d/puppetmaster altogether. Reproducible: Always # emerge --info Portage 2.1.4.4 (default/linux/amd64/2008.0, gcc-4.1.2, glibc-2.6.1-r0, 2.6.25-gentoo-r7 x86_64) ================================================================= System uname: 2.6.25-gentoo-r7 x86_64 Intel(R) Xeon(R) CPU E5410 @ 2.33GHz Timestamp of tree: Mon, 06 Oct 2008 01:15:01 +0000 ccache version 2.4 [enabled] app-shells/bash: 3.2_p33 dev-lang/python: 2.4.4-r14, 2.5.2-r6 dev-python/pycrypto: 2.0.1-r6 dev-util/ccache: 2.4-r7 sys-apps/baselayout: 1.12.11.1 sys-apps/sandbox: 1.2.18.1-r2 sys-devel/autoconf: 2.61-r2 sys-devel/automake: 1.9.6-r2, 1.10.1 sys-devel/binutils: 2.18-r3 sys-devel/gcc-config: 1.4.0-r4 sys-devel/libtool: 1.5.26 virtual/os-headers: 2.6.23-r3 ACCEPT_KEYWORDS="amd64" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-O2 -pipe -march=nocona" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/revdep-rebuild /etc/terminfo /etc/udev/rules.d" CXXFLAGS="-O2 -pipe -march=nocona" DISTDIR="/usr/portage/distfiles" FEATURES="buildpkg ccache distlocks metadata-transfer sandbox sfperms strict unmerge-orphans userfetch usersandbox" GENTOO_MIRRORS="ftp://de-mirror.org/distro/gentoo ftp://ftp.wh2.tu-dresden.de/pub/mirrors/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/ " LDFLAGS="-Wl,-O1" MAKEOPTS="-j5" PKGDIR="/usr/portage/packages" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage" USE="acl acpi amd64 apache2 bash-completion berkdb bzip2 cli cracklib crypt cups device-mapper dri fortran gdbm gnutls gpm iconv ipv6 isdnlog jpeg kvm ldap logrotate midi mmx mudflap multilib ncurses nls nptl nptlonly openmp pam pcre perl png pppd python readline reflection session spl sqlite3 sse sse2 ssl symlink sysfs tcpd unicode vim-syntax xorg zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" USERLAND="GNU" VIDEO_CARDS="fbdev glint i810 mach64 mga neomagic nv r128 radeon savage sis tdfx trident vesa vga via vmware voodoo" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LANG, LC_ALL, LINGUAS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PORTDIR_OVERLAY kc@gocept.com 2008-10-06 13:26:44 0000 Created an attachment (id=167449) /etc/init.d/puppetmaster patch kc@gocept.com 2008-10-06 13:27:10 0000 Created an attachment (id=167450) /etc/conf.d/puppetmaster patch matsuu@gentoo.org 2008-10-06 16:29:34 0000 puppet-0.24.5-r4 in cvs. 167449 2008-10-06 13:26 0000 /etc/init.d/puppetmaster patch init.d_puppetmaster.patch text/plain LS0tIC9ldGMvaW5pdC5kL3B1cHBldG1hc3Rlci5vcmlnCTIwMDgtMTAtMDYgMTU6MDk6MjQuMDAw MDAwMDAwICswMjAwCisrKyAvZXRjL2luaXQuZC9wdXBwZXRtYXN0ZXIJMjAwOC0xMC0wNiAxNTox MjoyNi4wMDAwMDAwMDAgKzAyMDAKQEAgLTE0LDE0ICsxNCw2IEBACiAJCXJldHVybiAxCiAJZmkK IAotCWxvY2FsIHNpdGVfbWFuaWZlc3Q9Ii9ldGMvcHVwcGV0L21hbmlmZXN0cy9zaXRlLnBwIgot CVtbIC1uICIke1BVUFBFVE1BU1RFUl9NQU5JRkVTVH0iIF1dICYmIHNpdGVfbWFuaWZlc3Q9IiR7 UFVQUEVUTUFTVEVSX01BTklGRVNUfSIKLQotCWlmIFsgISAtZiAiJHtzaXRlX21hbmlmZXN0fSIg XSA7IHRoZW4KLQkJZWVycm9yICJQbGVhc2UgY3JlYXRlICR7c2l0ZV9tYW5pZmVzdH0gYmVmb3Jl IHJ1bm5pbmcgcHVwcGV0IgotCQlyZXR1cm4gMQotCWZpCi0KIAlyZXR1cm4gMAogfQogCkBAIC0y OSw3ICsyMSw2IEBACiAJY2hlY2tjb25maWcgfHwgcmV0dXJuICQ/CiAKIAlsb2NhbCBvcHRpb25z PSIiCi0JW1sgLW4gIiR7UFVQUEVUTUFTVEVSX01BTklGRVNUfSIgXV0gICAmJiBvcHRpb25zPSIk e29wdGlvbnN9IC0tbWFuaWZlc3Q9JHtQVVBQRVRNQVNURVJfTUFOSUZFU1R9IgogCVtbIC1uICIk e1BVUFBFVE1BU1RFUl9MT0d9IiBdXSAgICAgICAgJiYgb3B0aW9ucz0iJHtvcHRpb25zfSAtLWxv Z2Rlc3Q9JHtQVVBQRVRNQVNURVJfTE9HfSIKIAlbWyAtbiAiJHtQVVBQRVRNQVNURVJfRVhUUkFf T1BUU30iIF1dICYmIG9wdGlvbnM9IiR7b3B0aW9uc30gJHtQVVBQRVRNQVNURVJfRVhUUkFfT1BU U30iCiAK 167450 2008-10-06 13:27 0000 /etc/conf.d/puppetmaster patch conf.d_puppetmaster.patch text/plain LS0tIC9ldGMvY29uZi5kL3B1cHBldG1hc3Rlci5vcmlnCTIwMDgtMTAtMDYgMTU6MTY6MDkuMDAw MDAwMDAwICswMjAwCisrKyAvZXRjL2NvbmYuZC9wdXBwZXRtYXN0ZXIJMjAwOC0xMC0wNiAxNTox NjoxMy4wMDAwMDAwMDAgKzAyMDAKQEAgLTEsOSArMSw2IEBACiAjIExvY2F0aW9uIG9mIFBJRCBm aWxlcwogUFVQUEVUTUFTVEVSX1BJRF9ESVI9Ii92YXIvcnVuL3B1cHBldCIKIAotIyBMb2NhdGlv biBvZiB0aGUgbWFpbiBtYW5pZmVzdAotUFVQUEVUTUFTVEVSX01BTklGRVNUPSIvaG9tZS9wdXBw ZXQvdGVzdGluZy9wdXBwZXQvbWFuaWZlc3RzL3NpdGUucHAiCi0KICMgV2hlcmUgdG8gbG9nIGdl bmVyYWwgbWVzc2FnZXMgdG8uCiAjIFNwZWNpZnkgc3lzbG9nIHRvIHNlbmQgbG9nIG1lc3NhZ2Vz IHRvIHRoZSBzeXN0ZW0gbG9nLgogI1BVUFBFVE1BU1RFUl9MT0c9InN5c2xvZyIK