Changeset 1198 for branches/fc11-dev


Ignore:
Timestamp:
Jun 14, 2009, 5:26:53 AM (12 years ago)
Author:
mitchb
Message:
Merge r1178:1197 from trunk to branches/fc11-dev
Location:
branches/fc11-dev
Files:
4 deleted
8 edited
4 copied

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev/locker/bin/webaccess

    r133 r1198  
    167167    if [ -s "$tmp_htaccess" ]; then
    168168        echo "Updating $htaccess" >&2
    169         chmod 777 "$tmp_htaccess"
    170169        mv -f "$tmp_htaccess" "$htaccess"
    171170    else
     
    181180if [ $enable_auth -eq 1 ]; then
    182181    if [ ! -e "$authuserfile" ]; then touch "$authuserfile"; fi
    183     chmod 777 "$authuserfile"
    184182   
    185183    tmp_authuserfile=$authuserfile.webaccess-new
     
    216214   
    217215    exec 3>&-
    218     chmod 777 "$tmp_authuserfile"
    219216    mv -f "$tmp_authuserfile" "$authuserfile"
    220217    trap - EXIT
  • branches/fc11-dev/lvs/debian/config/etc/ha.d/ldirectord.cf

    r1113 r1198  
    55quiescent=no
    66
    7 virtual=18.181.0.46:25
     7# iptables rules caused SMTP to use FWM 3
     8virtual=3
    89        real=18.181.0.53:25 gate 1024
    910        real=18.181.0.57:25 gate 1024
    10         real=18.181.0.167:25 gate 512
    11         fallback=18.187.1.128:25 gate
     11        real=18.181.0.167:25 gate 1024
    1212        service=smtp
    1313        scheduler=wlc
    1414        persistent=600
    15         protocol=tcp
     15        protocol=fwm
    1616        checktype=negotiate
     17        checkport=25
    1718
    18 virtual=18.181.0.46:80
    19         real=18.181.0.53:80 gate 1024
    20         real=18.181.0.57:80 gate 1024
    21         real=18.181.0.167:80 gate 512
    22         fallback=127.0.0.1:80 gate
    23         service=http
    24         request="heartbeat/http"
     19# Apache (80, 443, and 444) uses FWM 2
     20virtual=2
     21        real=18.181.0.53 gate 1024
     22        real=18.181.0.57 gate 1024
     23        real=18.181.0.167 gate 1024
     24        fallback=127.0.0.1 gate
     25        service=http
     26        request="heartbeat/http"
    2527        virtualhost="scripts.mit.edu"
    26         receive="1"
    27         scheduler=wlc
    28         persistent=600
    29         protocol=tcp
    30         checktype=negotiate
     28        receive="1"
     29        checktype=negotiate
     30        checkport=80
     31        scheduler=wlc
     32        persistent=600
     33        protocol=fwm
    3134
    32 virtual=18.181.0.46:443
    33         real=18.181.0.53:443 gate 1024
    34         real=18.181.0.57:443 gate 1024
    35         real=18.181.0.167:443 gate 512
    36         fallback=18.187.1.128:443 gate
    37         service=https
    38         request="heartbeat/https"
    39         virtualhost="scripts.mit.edu"
    40         receive="1"
    41         scheduler=wlc
    42         persistent=600
    43         protocol=tcp
    44         checktype=negotiate
    45 
    46 virtual=18.181.0.46:444
    47         real=18.181.0.53:444 gate 1024
    48         real=18.181.0.57:444 gate 1024
    49         real=18.181.0.167:444 gate 512
    50         fallback=18.187.1.128:444 gate
    51         service=https
    52         request="heartbeat/https"
    53         virtualhost="scripts.mit.edu"
    54         receive="1"
    55         scheduler=wlc
    56         persistent=600
    57         protocol=tcp
    58         checktype=negotiate
    59 
    60 virtual=18.181.0.43:25
    61         real=18.181.0.53:25 gate 1024
    62         real=18.181.0.57:25 gate 1024
    63         real=18.181.0.167:25 gate 512
    64         fallback=18.187.1.128:25 gate
    65         service=smtp
    66         scheduler=wlc
    67         persistent=600
    68         protocol=tcp
    69         checktype=negotiate
    70 
    71 virtual=18.181.0.43:80
    72         real=18.181.0.53:80 gate 1024
    73         real=18.181.0.57:80 gate 1024
    74         real=18.181.0.167:80 gate 512
    75         fallback=127.0.0.1:80 gate
    76         service=http
    77         request="heartbeat/http"
    78         receive="1"
    79         scheduler=wlc
    80         persistent=600
    81         protocol=tcp
    82         checktype=negotiate
    83 
    84 virtual=18.181.0.43:443
    85         real=18.181.0.53:443 gate 1024
    86         real=18.181.0.57:443 gate 1024
    87         real=18.181.0.167:443 gate 512
    88         fallback=18.187.1.128:443 gate
    89         service=https
    90         request="heartbeat/https"
    91         virtualhost="scripts.mit.edu"
    92         receive="1"
    93         scheduler=wlc
    94         persistent=600
    95         protocol=tcp
    96         checktype=negotiate
    97 
    98 virtual=18.181.0.43:444
    99         real=18.181.0.53:444 gate 1024
    100         real=18.181.0.57:444 gate 1024
    101         real=18.181.0.167:444 gate 512
    102         fallback=18.187.1.128:444 gate
    103         service=https
    104         request="heartbeat/https"
    105         virtualhost="scripts.mit.edu"
    106         receive="1"
    107         scheduler=wlc
    108         persistent=600
    109         protocol=tcp
    110         checktype=negotiate
    111 
    112 virtual=18.181.0.50:25
    113         real=18.181.0.53:25 gate 1024
    114         real=18.181.0.57:25 gate 1024
    115         real=18.181.0.167:25 gate 512
    116         fallback=18.187.1.128:25 gate
    117         service=smtp
    118         scheduler=wlc
    119         persistent=600
    120         protocol=tcp
    121         checktype=negotiate
    122 
    123 virtual=18.181.0.50:80
    124         real=18.181.0.53:80 gate 1024
    125         real=18.181.0.57:80 gate 1024
    126         real=18.181.0.167:80 gate 512
    127         fallback=127.0.0.1:80 gate
    128         service=http
    129         request="heartbeat/http"
    130         receive="1"
    131         scheduler=wlc
    132         persistent=600
    133         protocol=tcp
    134         checktype=negotiate
    135 
    136 virtual=18.181.0.50:443
    137         real=18.181.0.53:443 gate 1024
    138         real=18.181.0.57:443 gate 1024
    139         real=18.181.0.167:443 gate 512
    140         fallback=18.187.1.128:443 gate
    141         service=https
    142         request="heartbeat/https"
    143         virtualhost="scripts.mit.edu"
    144         receive="1"
    145         scheduler=wlc
    146         persistent=600
    147         protocol=tcp
    148         checktype=negotiate
    149 
    150 virtual=18.181.0.50:444
    151         real=18.181.0.53:444 gate 1024
    152         real=18.181.0.57:444 gate 1024
    153         real=18.181.0.167:444 gate 512
    154         fallback=18.187.1.128:444 gate
    155         service=https
    156         request="heartbeat/https"
    157         virtualhost="scripts.mit.edu"
    158         receive="1"
    159         scheduler=wlc
    160         persistent=600
    161         protocol=tcp
    162         checktype=negotiate
    163 
    164 virtual=18.181.0.49:80
    165         real=18.181.0.53:80 gate 1024
    166         real=18.181.0.57:80 gate 1024
    167         real=18.181.0.167:80 gate 512
    168         fallback=127.0.0.1:80 gate
    169         service=http
    170         request="heartbeat/http"
    171         virtualhost="scripts.mit.edu"
    172         receive="1"
    173         scheduler=wlc
    174         persistent=600
    175         protocol=tcp
    176         checktype=negotiate
    177 
    178 virtual=18.181.0.49:443
    179         real=18.181.0.53:443 gate 1024
    180         real=18.181.0.57:443 gate 1024
    181         real=18.181.0.167:443 gate 512
    182         fallback=18.187.1.128:443 gate
    183         service=https
    184         request="heartbeat/https"
    185         virtualhost="scripts.mit.edu"
    186         receive="1"
    187         scheduler=wlc
    188         persistent=600
    189         protocol=tcp
    190         checktype=negotiate
    191 
    192 virtual=18.181.0.49:444
    193         real=18.181.0.53:444 gate 1024
    194         real=18.181.0.57:444 gate 1024
    195         real=18.181.0.167:444 gate 512
    196         fallback=18.187.1.128:444 gate
    197         service=https
    198         request="heartbeat/https"
    199         virtualhost="scripts.mit.edu"
    200         receive="1"
    201         scheduler=wlc
    202         persistent=600
    203         protocol=tcp
    204         checktype=negotiate
    205 
     35# Everything else uses FWM 1 and gets sent only to the primary
    20636virtual=1
    20737        real=18.181.0.53 gate "heartbeat/services", "1"
  • branches/fc11-dev/lvs/debian/config/etc/inetd.conf

    r568 r1198  
    3939
    4040# Make it easy to remotely query these LVS servers
    41 # Joe Presbrey <presbrey@mit.edu>
    42 60001   stream  tcp     nowait  nobody  /usr/local/sbin/in.vs_main
    43 60002   stream  tcp     nowait  nobody  /usr/local/sbin/in.vs_stat
    44 60003   stream  tcp     nowait  nobody  /usr/local/sbin/in.vs_conn
     4179      stream  tcp     nowait  root    /sbin/ipvsadm
  • branches/fc11-dev/lvs/debian/config/etc/lighttpd/lighttpd.conf

    r1022 r1198  
    33        "mod_magnet",
    44)
     5
     6server.max-connections=4096
     7server.max-fds=9182
     8server.max-read-idle=5
    59
    610## a static document-root, for virtual-hosting take look at the
  • branches/fc11-dev/lvs/debian/config/etc/network/if-up.d/iptables

    r1005 r1198  
    11#!/bin/sh
    22## Joe Presbrey <presbrey@mit.edu>
     3## Quentin Smith <quentin@mit.edu>
    34## SIPB Scripts LVS Firewall marks
    45
    56iptables -F -t mangle
    67
     8# Create a table for regular scripts hosts
     9iptables -t mangle -N scripts 2>/dev/null || :
     10
     11# scripts-vhosts.mit.edu
     12iptables -A PREROUTING -t mangle -d 18.181.0.46 -j scripts
    713# scripts.mit.edu
    8 iptables -A PREROUTING -t mangle -m tcp -m multiport -p tcp -d 18.181.0.46/31 --dports 25,80,443,444 -j MARK --set-mark 2
    9 iptables -A PREROUTING -t mangle -m mark --mark 0 -d 18.181.0.46/31 -j MARK --set-mark 1
     14iptables -A PREROUTING -t mangle -d 18.181.0.43 -j scripts
     15# scripts-cert.mit.edu
     16iptables -A PREROUTING -t mangle -d 18.181.0.50 -j scripts
    1017
    11 # scripts-new.mit.edu
    12 iptables -A PREROUTING -t mangle -m tcp -m multiport -p tcp -d 18.181.0.43 --dports 25,80,443,444 -j MARK --set-mark 2
    13 iptables -A PREROUTING -t mangle -m mark --mark 0 -d 18.181.0.43 -j MARK --set-mark 1
     18# Send Apache-bound traffic to FWM 2 (load-balanced)
     19iptables -A scripts -t mangle -m tcp -m multiport -p tcp --dports 80,443,444 -j MARK --set-mark 2
     20# Send SMTP-bound traffic to FWM 3 (load-balanced)
     21iptables -A scripts -t mangle -m tcp -p tcp --dport 25 -j MARK --set-mark 3
     22# Send everything else to FWM 1 (primary)
     23iptables -A scripts -t mangle -m mark --mark 0 -j MARK --set-mark 1
    1424
    15 # scripts-cert.mit.edu
    16 iptables -A PREROUTING -t mangle -m tcp -m multiport -p tcp -d 18.181.0.50/31 --dports 25,80,443,444 -j MARK --set-mark 2
    17 iptables -A PREROUTING -t mangle -m mark --mark 0 -d 18.181.0.50/31 -j MARK --set-mark 1
    18 
    19 # webzephyr.mit.edu
    20 iptables -A PREROUTING -t mangle -m tcp -m multiport -p tcp -d 18.181.0.49 --dports 80,443 -j MARK --set-mark 2
     25# webzephyr.mit.edu is special because its SMTP needs to always go to the primary (FWM 1)
     26iptables -A PREROUTING -t mangle -m tcp -m multiport -p tcp -d 18.181.0.49 --dports 80,443,444 -j MARK --set-mark 2
    2127iptables -A PREROUTING -t mangle -m mark --mark 0 -d 18.181.0.49 -j MARK --set-mark 1
  • branches/fc11-dev/noc/nagios/contacts.cfg

    r1179 r1198  
    1414        contactgroup_name       pagers
    1515        alias                   Scripts Maintainers (Pagers)
    16         members                 quentin-cell
     16        members                 quentin-cell,geofft-pager
    1717}
    1818
  • branches/fc11-dev/server/doc/install-howto.sh

    r1186 r1198  
    138138# all packages may in fact be in use.)
    139139
     140# Check which packages are installed on your new server that are not
     141# in the snapshot, and remove ones that aren't needed for some reason
     142# on the new machine.  Otherwise, aside from bloat, you may end up
     143# with undesirable things for security, like sendmail.
     144
    140145# Install the full list of perl modules that users expect to be on the
    141146# scripts.mit.edu servers.
     
    149154# perldoc -u perllocal | grep head2 | cut -f 3 -d '<' | cut -f 1 -d '|' | sort -u | perl -ne 'chomp; print "notest install $_\n" if system("rpm -q --whatprovides \"perl($_)\" >/dev/null 2>/dev/null")' > /mit/scripts/config/perl-packages.txt
    150155# Then on the server you're installing,
    151     cat perl-packages.txt | perl -MCPAN -e shell
     156#    cat perl-packages.txt | perl -MCPAN -e shell
    152157
    153158# Install the Python eggs and Ruby gems and PEAR/PECL doohickeys that are on
     
    162167#   Yet again, 'yum search' for RPMs before resorting to 'pear install'.  Note
    163168#   that for things in the beta repo, you'll need 'pear install package-beta'.
     169# - Look at `pecl list` for PECL things.  'yum search', and if you must,
     170#   'pecl install' needed items.
    164171
    165172# echo 'import site, os.path; site.addsitedir(os.path.expanduser("~/lib/python2.6/site-packages"))' > /usr/lib/python2.6/site-packages/00scripts-home.pth
     173
     174# Build and install the scripts php module that enhances error logging info
     175# XXX This thing really ought to be packaged
     176# cp -r /srv/repository/server/common/oursrc/php_scripts /root
     177# cd /root/php_scripts
     178# ./build.sh
     179# cp test/modules/scripts.so /usr/lib64/php/modules
    166180
    167181# Install the credentials.  There are a lot of things to remember here:
  • branches/fc11-dev/server/fedora/config/etc/php.d/dom.ini

    r813 r1198  
     1extension = dom.so
Note: See TracChangeset for help on using the changeset viewer.