Changeset 1258


Ignore:
Timestamp:
Jul 9, 2009, 3:35:24 PM (12 years ago)
Author:
mitchb
Message:
Merge r1250:1257 from trunk to branches/fc11-dev (final merge)
Location:
branches/fc11-dev
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev

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

    r1251 r1258  
    3232        hostgroup_name  scripts-mail
    3333        alias   Mail servers
    34         members b-m,o-f,b-k,c-w,p-b
     34        members b-m,o-f,b-k,c-w,p-b,b-b
    3535}
    3636
     
    3838        hostgroup_name  scripts-cron
    3939        alias   Cron servers
    40         members b-m,o-f,b-k,c-w,p-b
     40        members b-m,o-f,b-k,c-w,p-b,b-b
    4141}
    4242
     
    4444        hostgroup_name  scripts-user
    4545        alias   User servers
    46         members b-m,o-f,b-k,c-w,p-b
     46        members b-m,o-f,b-k,c-w,p-b,b-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,p-b,r-f,r-b,s-b,scripts,scripts-cert,sipb-ether,sql,wildcard.scripts
     52        members b-b,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,p-b,r-f,r-b,s-b
     58        members b-b,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

    r1251 r1258  
    128128        alias           pancake-bunny
    129129        address         18.181.0.237
     130}
     131
     132define host {
     133        use     scripts-sipb-host
     134        host_name       b-b
     135        alias           busy-beaver
     136        address         18.181.0.234
     137}
    130138
    131139# LVS
  • 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/specs/scripts-python-path.spec

    r957 r1258  
    1717%prep
    1818%setup -q -n %{name}
     19%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
    1920
    2021%install
    2122[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
    22 install -D 00scripts-home.pth $RPM_BUILD_ROOT/usr/lib/python2.5/site-packages
     23install -d $RPM_BUILD_ROOT%{python_sitelib}
     24install -m 644 00scripts-home.pth $RPM_BUILD_ROOT%{python_sitelib}
    2325
    2426%clean
     
    2729%files
    2830%defattr(0644, root, root)
    29 /usr/lib/python2.5/site-packages/00scripts-home.pth
     31%{python_sitelib}/00scripts-home.pth
    3032
    3133%changelog
     34* Thu Jul  9 2009  Geoffrey Thomas <geofft@mit.edu>
     35- Update to Python 2.6
    3236* Tue Jan 27 2009  Quentin Smith <quentin@mit.edu>
    3337- initial release
Note: See TracChangeset for help on using the changeset viewer.