Ignore:
Timestamp:
Nov 22, 2011, 12:45:17 AM (11 years ago)
Author:
achernya
Message:
Merge branches/fc15-dev to trunk
Location:
trunk
Files:
4 deleted
25 edited
9 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/fedora/config/etc/cron.d/slapdagent

    r1716 r2066  
    11KRB5CCNAME=/var/run/dirsrv/krb5cc
    22MAILTO=scripts-root@mit.edu
    3 0 */3 * * * fedora-ds /usr/kerberos/bin/kinit -k -t /etc/dirsrv/keytab ldap/$(hostname)
     30 */3 * * * fedora-ds /usr/bin/kinit -k -t /etc/dirsrv/keytab ldap/$(hostname)
  • trunk/server/fedora/config/etc/hosts

    r1684 r2066  
    181818.181.0.234    busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7
    191918.181.0.235    real-mccoy.mit.edu real-mccoy scripts8.mit.edu scripts8
    20 18.181.0.135    shining-armor.mit.edu shining-armor # scripts9.mit.edu scripts9
     2018.181.0.135    shining-armor.mit.edu shining-armor scripts9.mit.edu scripts9
     2118.181.0.141    golden-egg.mit.edu golden-egg scripts10.mit.edu scripts10
    2122
    2223172.21.0.57     better-mousetrap.mit.edu
     
    2930172.21.0.235    real-mccoy.mit.edu
    3031172.21.0.135    shining-armor.mit.edu
     32172.21.0.141    golden-egg.mit.edu
  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-special.conf

    r1483 r2066  
    11Alias /__scripts/heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
    2 Alias /__scripts/django/media /usr/lib/python2.6/site-packages/django/contrib/admin/media
     2Alias /__scripts/django/media /usr/lib/python2.7/site-packages/django/contrib/admin/media
    33Alias /__scripts /afs/athena.mit.edu/contrib/scripts/www
    44
     
    99</Directory>
    1010
    11 <Directory /usr/lib/python2.6/site-packages/django/contrib/admin/media>
     11<Directory /usr/lib/python2.7/site-packages/django/contrib/admin/media>
    1212    <Files *>
    1313        SetHandler none
  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf

    r1700 r2066  
    11ServerName scripts.mit.edu
    2 ServerAlias scripts 18.181.0.43 scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 scripts-test.mit.edu scripts-test 18.181.0.229 better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 whole-enchilada.mit.edu whole-enchilada w-e.mit.edu w-e scripts5.mit.edu scripts5 18.181.0.236 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 localhost 127.0.0.1 ::1
     2ServerAlias \
     3    scripts 18.181.0.43 \
     4    scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 \
     5    scripts-test.mit.edu scripts-test 18.181.0.229 \
     6    better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 \
     7    old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 \
     8    bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 \
     9    cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 \
     10    whole-enchilada.mit.edu whole-enchilada w-e.mit.edu w-e scripts5.mit.edu scripts5 18.181.0.236 \
     11    pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 \
     12    busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 \
     13    real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 \
     14    shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 \
     15    golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \
     16    localhost 127.0.0.1 ::1
  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost.conf

    r811 r2066  
    11DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
    22SuExecUserGroup scripts users
     3UserDir enabled
    34UserDir web_scripts
    45# Comment the following line out to take the machine out of the LVS pool
  • trunk/server/fedora/config/etc/krb5.conf

    r708 r2066  
    11[libdefaults]
     2        allow_weak_crypto = true
    23        default_realm = ATHENA.MIT.EDU
    34# The following krb5.conf variables are only for MIT Kerberos.
  • trunk/server/fedora/config/etc/php.d/_scripts.ini

    r1362 r2066  
    33cgi.force_redirect = 0
    44memory_limit = 1024M
     5date.timezone = America/New_York
  • trunk/server/fedora/config/etc/php.d/tidy.ini

    r813 r2066  
    1 
  • trunk/server/fedora/config/etc/pki/tls/certs/nudelta.pem

  • trunk/server/fedora/config/etc/postfix/main.cf

    r1868 r2066  
    1717recipient_delimiter = +
    1818inet_interfaces = all
    19 readme_directory = /usr/share/doc/postfix-2.7.4/README_FILES
    20 sample_directory = /usr/share/doc/postfix-2.7.4/samples
     19readme_directory = /usr/share/doc/postfix-2.8.5/README_FILES
     20sample_directory = /usr/share/doc/postfix-2.8.5/samples
    2121sendmail_path = /usr/sbin/sendmail
    2222html_directory = no
  • trunk/server/fedora/config/etc/rc.d/rc.local

    • Property svn:executable set to *
    r227 r2066  
    33touch /var/lock/subsys/local
    44
    5 if [ -r "/afs/athena.mit.edu" ]; then
    6         /sbin/service postfix start
    7 fi
    8 
    95/bin/mkdir -pm 1773 /tmp/sessions
  • trunk/server/fedora/config/etc/scripts/allowed-setugid.list

    r1917 r2066  
    1 /bin/ping
    2 /bin/ping6
    31/sbin/pam_timestamp_check
    42/sbin/unix_chkpwd
  • trunk/server/fedora/config/etc/ssh/shosts.equiv

    r1702 r2066  
    88shining-armor.mit.edu
    99whole-enchilada.mit.edu
     10golden-egg.mit.edu
    1011172.21.0.53
    1112172.21.0.57
     
    1718172.21.0.135
    1819172.21.0.236
     20172.21.0.141
  • trunk/server/fedora/config/etc/ssh/ssh_known_hosts

    r1703 r2066  
    88whole-enchilada.mit.edu,whole-enchilada,w-e.mit.edu,w-e,scripts5.mit.edu,scripts5,18.181.0.236,172.21.0.236 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
    99shining-armor.mit.edu,shining-armor,s-a.mit.edu,s-a,scripts9.mit.edu,scripts9,18.181.0.135,172.21.0.135 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
     10golden-egg.mit.edu.golden-egg,g-e.mit.edu,g-e,scripts10.mit.edu,scripts10,18.181.0.141,172.21.0.141 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
  • trunk/server/fedora/config/etc/ssh/sshd_config

    r1703 r2066  
    2020IgnoreRhosts yes
    2121IgnoreUserKnownHosts yes
    22 DenyUsers root@old-faithful.mit.edu root@better-mousetrap.mit.edu root@bees-knees.mit.edu root@cats-whiskers.mit.edu root@pancake-bunny.mit.edu root@busy-beaver.mit.edu root@real-mccoy.mit.edu root@whole-enchilada.mit.edu root@shining-armor.mit.edu
     22DenyUsers root@old-faithful.mit.edu root@better-mousetrap.mit.edu root@bees-knees.mit.edu root@cats-whiskers.mit.edu root@pancake-bunny.mit.edu root@busy-beaver.mit.edu root@real-mccoy.mit.edu root@whole-enchilada.mit.edu root@shining-armor.mit.edu root@golden-egg.mit.edu
  • trunk/server/fedora/config/etc/sysconfig/dirsrv

    r1716 r2066  
    3232# slapdagent cronjob) -- geofft 30 October 2010
    3333KRB5CCNAME=/var/run/dirsrv/krb5cc; export KRB5CCNAME
    34 /usr/kerberos/bin/kinit -k -t "$KRB5_KTNAME" ldap/"$(hostname)"
     34/usr/bin/kinit -k -t "$KRB5_KTNAME" ldap/"$(hostname)"
    3535chown --reference="$KRB5_KTNAME" "$KRB5CCNAME"
    3636
  • trunk/server/fedora/config/etc/sysconfig/httpd

    r759 r2066  
    2121#
    2222#HTTPD_LANG=C
     23
     24#
     25# When stopping the server a 10 second timeout is allowed before
     26# forcibly terminating the parent process (with a SIGKILL signal).
     27# To allow a longer delay, set the STOP_TIMEOUT variable.
     28#
     29#STOP_TIMEOUT=10
     30#
  • trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1

    r1789 r2066  
    121218.181.0.235 via 172.21.0.235
    131318.181.0.135 via 172.21.0.135
     1418.181.0.141 via 172.21.0.141
  • trunk/server/fedora/config/etc/sysconfig/openafs

    r1993 r2066  
    11AFSD_ARGS="-afsdb -dynroot -fakestat-all -stat 25000 -daemons 100 -volumes 4000 -files 400000 -chunksize 19"
    22BOSSERVER_ARGS=
    3 
    4 postinit () {
    5         /sbin/sysctl -q afs.GCPAGs=0
    6         /usr/bin/fs setcrypt on
    7         case "$(lsb_release -cs)" in
    8           Moonshine)
    9             /usr/bin/fs sysname 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora7' 'amd64_linux26' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' 'i386_linux1' ;;
    10           Sulphur)
    11             /usr/bin/fs sysname 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
    12           Leonidas)
    13             /usr/bin/fs sysname 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
    14           Goddard)
    15             /usr/bin/fs sysname 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
    16           *)
    17             echo "Warning: unknown platform. AFS sysname not set."
    18         esac
    19         /usr/bin/fs setcell -nosuid -c athena
    20 }
    21 AFS_POST_INIT=postinit
  • trunk/server/fedora/config/etc/sysconfig/sysstat

    r72 r2066  
    1 # How long to keep log files (days), maximum is a month
     1# sysstat-9.0.6.1 configuration file.
     2
     3# How long to keep log files (in days).
     4# If value is greater than 28, then log files are kept in
     5# multiple directories, one for each month.
    26HISTORY=30
     7
     8# Compress (using gzip or bzip2) sa and sar files older than (in days):
     9COMPRESSAFTER=10
     10
     11# Parameters for system activity collector (see sadc man-page) which
     12# are used for the generation of log files
     13SADC_OPTIONS="-S DISK"
  • trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl

    r1747 r2066  
    3232sub buildKeyMap($) {
    3333    my ($file) = @_;
    34     open (KEYS, $file) or warn "Couldn't open $file: $!";
     34    open (KEYS, $file) or (warn "Couldn't open $file: $!\n" and return);
    3535    while (<KEYS>) {
    3636        chomp;
     
    5858buildKeyMap("/root/.ssh/authorized_keys2");
    5959
    60 while (1) {
    61     my @message = scalar(<>);
     60my @message;
     61
     62while (my $line = <>) {
     63    @message = $line;
    6264    eval {
    6365        local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required
     
    8082        } elsif ($message =~ m|Root (\S+) shell|) {
    8183            sendmsg($message);
    82         } elsif ($message =~ m|session \S+ for user (\S+)|) {
    83             sendmsg($message) if exists $USERS{$1};
     84        } elsif ($message =~ m|pam_unix\(([^:]+):session\): session \S+ for user (\S+)|) {
     85            sendmsg($message) if $1 ne "cron" and exists $USERS{$2};
    8486        } elsif ($message =~ m|^Found matching (\w+) key: (\S+)|) {
    8587            if ($sshkeys{$2}) {
     
    117119        } elsif ($message =~ m|^ *root : TTY=|) {
    118120        } elsif ($message =~ m|^Set /proc/self/oom_adj to |) {
     121        } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) {
    119122        } else {
    120123            sendmsg($message, "scripts-spew");
  • trunk/server/fedora/config/etc/syslog-ng/syslog-ng.conf

    r1259 r2066  
     1@version:3.2
     2
    13# syslog-ng configuration file.
    24#
     
    810
    911options {
    10         sync (0);
     12        flush_lines (0);
    1113        time_reopen (10);
    1214        log_fifo_size (1000);
     
    1618        create_dirs (no);
    1719        keep_hostname (yes);
     20        stats_freq (0);
    1821};
    1922
    2023source s_sys {
    21         file ("/proc/kmsg" log_prefix("kernel: "));
     24        file ("/proc/kmsg" program_override("kernel: "));
    2225        unix-stream ("/dev/log");
    2326        internal();
     
    2831destination d_mesg { file("/var/log/messages"); };
    2932destination d_auth { file("/var/log/secure"); };
    30 destination d_mail { file("/var/log/maillog" sync(10)); };
     33destination d_mail { file("/var/log/maillog" flush_lines(10)); };
    3134destination d_spol { file("/var/log/spooler"); };
    3235destination d_boot { file("/var/log/boot.log"); };
  • trunk/server/fedora/config/etc/yum.conf

    r1722 r2066  
    99plugins=1
    1010metadata_expire=1800
    11 installonlypkgs=kernel kernel-devel kmod-openafs
     11installonlypkgs=kernel kernel-devel kmod-openafs ghc-cgi ghc-cgi-devel
    1212
    1313# PUT YOUR REPOS HERE OR IN separate files named file.repo
  • trunk/server/fedora/config/etc/yum.repos.d/scripts.repo

    r1888 r2066  
    11[scripts]
    22name=Scripts
    3 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc13/
     3baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/
    44enabled=1
    55gpgcheck=0
     
    77[scripts-testing]
    88name=Scripts Testing
    9 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc13-testing/
     9baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15-testing/
    1010enabled=0
    1111gpgcheck=0
  • trunk/server/fedora/config/etc/yum/post-actions/statoverride.action

    r1926 r2066  
    2222/usr/bin/write:install:chmod ug-s /usr/bin/write
    2323/usr/bin/Xorg:install:chmod ug-s /usr/bin/Xorg
    24 /usr/kerberos/bin/ksu:install:chmod ug-s /usr/kerberos/bin/ksu
     24/usr/bin/ksu:install:chmod ug-s /usr/bin/ksu
    2525/usr/lib64/nspluginwrapper/plugin-config:install:chmod ug-s /usr/lib64/nspluginwrapper/plugin-config
    2626/usr/lib64/vte/gnome-pty-helper:install:chmod ug-s /usr/lib64/vte/gnome-pty-helper
     27/usr/libexec/kde4/kpac_dhcp_helper:install:chmod ug-s /usr/libexec/kde4/kpac_dhcp_helper
    2728/usr/sbin/ccreds_chkpwd:install:chmod ug-s /usr/sbin/ccreds_chkpwd
    2829/usr/sbin/userisdnctl:install:chmod ug-s /usr/sbin/userisdnctl
    2930/usr/sbin/usernetctl:install:chmod ug-s /usr/sbin/usernetctl
     31/usr/bin/pkexec:install:chmod ug-s /usr/bin/pkexec
Note: See TracChangeset for help on using the changeset viewer.