Changeset 1251 for branches


Ignore:
Timestamp:
Jul 8, 2009, 11:57:06 PM (16 years ago)
Author:
mitchb
Message:
Merge r1245:1250 from trunk to branches/fc11-dev
Location:
branches/fc11-dev
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/fc11-dev

  • branches/fc11-dev/noc/nagios/hostgroups.cfg

    r1179 r1251  
    3232        hostgroup_name  scripts-mail
    3333        alias   Mail servers
    34         members b-m,o-f,b-k,c-w
     34        members b-m,o-f,b-k,c-w,p-b
    3535}
    3636
    … …  
    3838        hostgroup_name  scripts-cron
    3939        alias   Cron servers
    40         members b-m,o-f,b-k,c-w
     40        members b-m,o-f,b-k,c-w,p-b
    4141}
    4242
    … …  
    4444        hostgroup_name  scripts-user
    4545        alias   User servers
    46         members b-m,o-f,b-k,c-w
     46        members b-m,o-f,b-k,c-w,p-b
    4747}
    4848
    … …  
    5050        hostgroup_name  scripts-all
    5151        alias   All scripts hosts
    52         members b-k,b-m,c-w,k-s,o-f,r-f,r-b,s-b,scripts,scripts-cert,sipb-ether,sql,wildcard.scripts
     52        members b-k,b-m,c-w,k-s,o-f,p-b,r-f,r-b,s-b,scripts,scripts-cert,sipb-ether,sql,wildcard.scripts
    5353}
    5454
    … …  
    5656        hostgroup_name  scripts-real
    5757        alias   All physical scripts servers
    58         members b-k,b-m,c-w,k-s,o-f,r-f,r-b,s-b
     58        members b-k,b-m,c-w,k-s,o-f,p-b,r-f,r-b,s-b
    5959}

  • branches/fc11-dev/noc/nagios/hosts.cfg

    r1179 r1251  
    123123}
    124124
     125define host {
     126        use     scripts-sipb-host
     127        host_name       p-b
     128        alias           pancake-bunny
     129        address         18.181.0.237
     130
    125131# LVS
    126132

  • branches/fc11-dev/server/common/oursrc/php_scripts/php_scripts-config.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/fc11-dev/server/fedora/config/etc/hosts

    r1246 r1251  
    151518.181.0.228    cats-whiskers.mit.edu cats-whiskers scripts4.mit.edu scripts4
    161618.181.0.237    pancake-bunny.mit.edu pancake-bunny scripts6.mit.edu scripts6
     1718.181.0.234    busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7
    1718
    1819172.21.0.53     old-faithful.mit.edu
    … …  
    2122172.21.0.228    cats-whiskers.mit.edu
    2223172.21.0.237    pancake-bunny.mit.edu
     24172.21.0.234    busy-beaver.mit.edu

  • branches/fc11-dev/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf

    r1246 r1251  
    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 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 localhost 127.0.0.1 ::1
     2ServerAlias 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 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 localhost 127.0.0.1 ::1

  • branches/fc11-dev/server/fedora/config/etc/ssh/shosts.equiv

    r1246 r1251  
    44cats-whiskers.mit.edu
    55pancake-bunny.mit.edu
     6busy-beaver.mit.edu
    67172.21.0.53
    78172.21.0.57
    … …  
    910172.21.0.228
    1011172.21.0.237
     12172.21.0.234

  • branches/fc11-dev/server/fedora/config/etc/ssh/ssh_known_hosts

    r1246 r1251  
     1busy-beaver.mit.edu,busy-beaver,b-b.mit.edu,b-b,scripts7.mit.edu,scripts7,18.181.0.234,172.21.0.234 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
    12pancake-bunny.mit.edu,pancake-bunny,p-b.mit.edu,p-b,scripts6.mit.edu,scripts6,18.181.0.237,172.21.0.237 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
    23cats-whiskers.mit.edu,cats-whiskers,c-w.mit.edu,c-w,scripts4.mit.edu,scripts4,18.181.0.228,172.21.0.228 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==

  • branches/fc11-dev/server/fedora/config/etc/ssh/sshd_config

    r1246 r1251  
    1919IgnoreRhosts yes
    2020IgnoreUserKnownHosts yes
    21 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
     21DenyUsers 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

  • branches/fc11-dev/server/fedora/config/etc/sysconfig/network-scripts/route-eth1

    r1246 r1251  
    6618.181.0.167 via 172.21.0.167
    7718.181.0.228 via 172.21.0.228
     818.181.0.234 via 172.21.0.234
    8918.181.0.237 via 172.21.0.237
Note: See TracChangeset for help on using the changeset viewer.