Index: trunk/server/fedora/config/etc/default/grub =================================================================== --- trunk/server/fedora/config/etc/default/grub (revision 2246) +++ trunk/server/fedora/config/etc/default/grub (revision 2246) @@ -0,0 +1,6 @@ +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="Fedora" +GRUB_DEFAULT=saved +GRUB_TERMINAL="serial console" +GRUB_SERIAL_COMMAND="serial" +GRUB_CMDLINE_LINUX="rd.md=0 rd.lvm=0 rd.dm=0 console=hvc0 KEYTABLE=us rd.luks=0 SYSFONT=True LANG=en_US.UTF-8" Index: trunk/server/fedora/config/etc/hosts =================================================================== --- trunk/server/fedora/config/etc/hosts (revision 2237) +++ trunk/server/fedora/config/etc/hosts (revision 2246) @@ -20,4 +20,6 @@ 18.181.0.135 shining-armor.mit.edu shining-armor scripts9.mit.edu scripts9 18.181.0.141 golden-egg.mit.edu golden-egg scripts10.mit.edu scripts10 +18.181.0.203 miracle-cure.mit.edu miracle-cure scripts11.mit.edu scripts11 +18.181.0.204 lucky-star.mit.edu lucky-star scripts12.mit.edu scripts12 172.21.0.57 better-mousetrap.mit.edu @@ -31,2 +33,4 @@ 172.21.0.135 shining-armor.mit.edu 172.21.0.141 golden-egg.mit.edu +172.21.0.203 miracle-cure.mit.edu +172.21.0.204 lucky-star.mit.edu Index: trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf (revision 2237) +++ trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf (revision 2246) @@ -14,3 +14,5 @@ shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 \ golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \ + miracle-cure.mit.edu miracle-cure m-c.mit.edu m-c scripts11.mit.edu scripts11 18.181.0.203 \ + lucky-star.mit.edu lucky-star l-s.mit.edu l-s scripts12.mit.edu scripts12 18.181.0.204 \ localhost 127.0.0.1 ::1 Index: trunk/server/fedora/config/etc/mock/scripts-fc17-i386.cfg =================================================================== --- trunk/server/fedora/config/etc/mock/scripts-fc17-i386.cfg (revision 2246) +++ trunk/server/fedora/config/etc/mock/scripts-fc17-i386.cfg (revision 2246) @@ -0,0 +1,44 @@ +config_opts['root'] = 'fedora-17-i386' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc17' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-17&arch=i386 +failovermethod=priority + +[updates-released] +name=updates +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f17&arch=i386 +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/17/i386/ +failovermethod=priority + +[local] +name=local +baseurl=file:///home/scripts-build/mock-local/ +cost=2000 +enabled=1 + +[scripts] +name=Scripts +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/ +enabled=1 +gpgcheck=0 +""" Index: trunk/server/fedora/config/etc/mock/scripts-fc17-x86_64.cfg =================================================================== --- trunk/server/fedora/config/etc/mock/scripts-fc17-x86_64.cfg (revision 2246) +++ trunk/server/fedora/config/etc/mock/scripts-fc17-x86_64.cfg (revision 2246) @@ -0,0 +1,48 @@ +config_opts['root'] = 'fedora-17-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64') +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc17' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all +# .i?86 packages except these. +#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 +# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-17&arch=x86_64 +failovermethod=priority + +[updates-released] +name=updates +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f17&arch=x86_64 +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/17/x86_64/ +failovermethod=priority + +[local] +name=local +baseurl=file:///home/scripts-build/mock-local/ +cost=2000 +enabled=1 + +[scripts] +name=Scripts +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/ +enabled=1 +gpgcheck=0 +""" Index: trunk/server/fedora/config/etc/modules-load.d/binfmt_misc.conf =================================================================== --- trunk/server/fedora/config/etc/modules-load.d/binfmt_misc.conf (revision 2246) +++ trunk/server/fedora/config/etc/modules-load.d/binfmt_misc.conf (revision 2246) @@ -0,0 +1,1 @@ +binfmt_misc Index: trunk/server/fedora/config/etc/scripts/allowed-filecaps.list =================================================================== --- trunk/server/fedora/config/etc/scripts/allowed-filecaps.list (revision 2237) +++ trunk/server/fedora/config/etc/scripts/allowed-filecaps.list (revision 2246) @@ -1,4 +1,4 @@ -/bin/ping -/bin/ping6 +/usr/bin/ping +/usr/bin/ping6 /usr/sbin/fping /usr/sbin/fping6 Index: trunk/server/fedora/config/etc/scripts/allowed-setugid.list =================================================================== --- trunk/server/fedora/config/etc/scripts/allowed-setugid.list (revision 2237) +++ trunk/server/fedora/config/etc/scripts/allowed-setugid.list (revision 2246) @@ -1,4 +1,4 @@ -/sbin/pam_timestamp_check -/sbin/unix_chkpwd +/usr/sbin/pam_timestamp_check +/usr/sbin/unix_chkpwd /usr/bin/at /usr/bin/crontab Index: trunk/server/fedora/config/etc/sysconfig/dirsrv =================================================================== --- trunk/server/fedora/config/etc/sysconfig/dirsrv (revision 2237) +++ trunk/server/fedora/config/etc/sysconfig/dirsrv (revision 2246) @@ -6,4 +6,6 @@ # dirsrv-localhost for the slapd-localhost instance. +# This file is in systemd EnvironmentFile format - see man systemd.exec + # In order to make more file descriptors available # to the directory server, first make sure the system @@ -12,4 +14,7 @@ # desired value # ulimit -n 8192 +# note - if using systemd, ulimit won't work - you must edit +# the systemd unit file for directory server to add the +# LimitNOFILE option - see man systemd.exec for more info # A per instance keytab does not make much sense for servers. @@ -27,23 +32,13 @@ # file - uncomment the following line and set # the path and filename appropriately -KRB5_KTNAME=/etc/dirsrv/keytab ; export KRB5_KTNAME - -# other environment settings can be added here too -OS=`uname -s` -# use the new mt slab memory allocator on Solaris -# this requires Solaris 9 update 3 or later -if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then - LD_PRELOAD=/usr/lib/libumem.so - export LD_PRELOAD -fi -if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then - LD_PRELOAD_64=/usr/lib/64/libumem.so - export LD_PRELOAD_64 -fi +# if using systemd, omit the "; export VARNAME" at the end +# KRB5_KTNAME=/etc/dirsrv/myname.keytab ; export KRB5_KTNAME # how many seconds to wait for the startpid file to show # up before we assume there is a problem and fail to start +# if using systemd, omit the "; export VARNAME" at the end #STARTPID_TIME=10 ; export STARTPID_TIME # how many seconds to wait for the pid file to show # up before we assume there is a problem and fail to start +# if using systemd, omit the "; export VARNAME" at the end #PID_TIME=600 ; export PID_TIME Index: trunk/server/fedora/config/etc/sysconfig/dirsrv-scripts =================================================================== --- trunk/server/fedora/config/etc/sysconfig/dirsrv-scripts (revision 2246) +++ trunk/server/fedora/config/etc/sysconfig/dirsrv-scripts (revision 2246) @@ -0,0 +1,24 @@ +# This file is sourced by dirsrv upon startup to set +# the default environment for a single specific directory +# server instances. To set defaults for all instances, edit +# the file in the same directory called dirsrv. + +# These settings are used by the start-dirsrv and +# start-slapd scripts (as well as their associates stop +# and restart scripts). Do not edit them unless you know +# what you are doing. + +# This file is in systemd EnvironmentFile format - see man systemd.exec + +SERVER_DIR=/usr/lib64/dirsrv +SERVERBIN_DIR=/usr/sbin +CONFIG_DIR=/etc/dirsrv/slapd-scripts +INST_DIR=/usr/lib64/dirsrv/slapd-scripts +RUN_DIR=/var/run/dirsrv +DS_ROOT= +PRODUCT_NAME=slapd + +# Put custom instance specific settings below here. +# if using systemd, omit the "; export VARNAME" at the end + +KRB5_KTNAME=/etc/dirsrv/keytab Index: trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1 =================================================================== --- trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1 (revision 2237) +++ trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1 (revision 2246) @@ -14,2 +14,4 @@ 18.181.0.141 via 172.21.0.141 18.181.0.199 via 172.21.0.199 +18.181.0.203 via 172.21.0.203 +18.181.0.204 via 172.21.0.204 Index: trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl =================================================================== --- trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl (revision 2237) +++ trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl (revision 2246) @@ -136,4 +136,5 @@ } elsif ($message =~ m|^Set /proc/self/oom_score_adj to |) { } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) { + } elsif ($message =~ m|^selinux sandbox not useful \[preauth\]$|) { } else { sendmsg($message, "scripts-spew"); Index: trunk/server/fedora/config/etc/yum.repos.d/scripts.repo =================================================================== --- trunk/server/fedora/config/etc/yum.repos.d/scripts.repo (revision 2237) +++ trunk/server/fedora/config/etc/yum.repos.d/scripts.repo (revision 2246) @@ -1,5 +1,5 @@ [scripts] name=Scripts -baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/ +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/ enabled=1 gpgcheck=0 @@ -7,5 +7,5 @@ [scripts-testing] name=Scripts Testing -baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15-testing/ +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17-testing/ enabled=0 gpgcheck=0