Changeset 1258

Timestamp:

Jul 9, 2009, 3:35:24 PM (15 years ago)

Author:

mitchb

Message:

Merge r1250:1257 from trunk to branches/fc11-dev (final merge)

Location:

branches/fc11-dev

Files:

• . (modified) (1 prop)
• noc/nagios/hostgroups.cfg (modified) (5 diffs)
• noc/nagios/hosts.cfg (modified) (1 diff)
• server/common/oursrc/php_scripts/php_scripts-config.m4 (modified) (1 prop)
• server/fedora/specs/scripts-python-path.spec (modified) (2 diffs)

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

@@ -32 +32 @@
         hostgroup_name  scripts-mail
         alias   Mail servers
-        members b-m,o-f,b-k,c-w,p-b
+        members b-m,o-f,b-k,c-w,p-b,b-b
 }
 
@@ -38 +38 @@
         hostgroup_name  scripts-cron
         alias   Cron servers
-        members b-m,o-f,b-k,c-w,p-b
+        members b-m,o-f,b-k,c-w,p-b,b-b
 }
 
@@ -44 +44 @@
         hostgroup_name  scripts-user
         alias   User servers
-        members b-m,o-f,b-k,c-w,p-b
+        members b-m,o-f,b-k,c-w,p-b,b-b
 }
 
@@ -50 +50 @@
         hostgroup_name  scripts-all
         alias   All scripts hosts
-        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
+        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
 }
 
@@ -56 +56 @@
         hostgroup_name  scripts-real
         alias   All physical scripts servers
-        members b-k,b-m,c-w,k-s,o-f,p-b,r-f,r-b,s-b
+        members b-b,b-k,b-m,c-w,k-s,o-f,p-b,r-f,r-b,s-b
 }

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

@@ -128 +128 @@
         alias           pancake-bunny
         address         18.181.0.237
+}
+
+define host {
+        use     scripts-sipb-host
+        host_name       b-b
+        alias           busy-beaver
+        address         18.181.0.234
+}
 
 # LVS

branches/fc11-dev/server/fedora/specs/scripts-python-path.spec

@@ -17 +17 @@
 %prep
 %setup -q -n %{name}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %install
 [ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
-install -D 00scripts-home.pth $RPM_BUILD_ROOT/usr/lib/python2.5/site-packages
+install -d $RPM_BUILD_ROOT%{python_sitelib}
+install -m 644 00scripts-home.pth $RPM_BUILD_ROOT%{python_sitelib}
 
 %clean
@@ -27 +29 @@
 %files
 %defattr(0644, root, root)
-/usr/lib/python2.5/site-packages/00scripts-home.pth
+%{python_sitelib}/00scripts-home.pth
 
 %changelog
+* Thu Jul  9 2009  Geoffrey Thomas <geofft@mit.edu>
+- Update to Python 2.6
 * Tue Jan 27 2009  Quentin Smith <quentin@mit.edu>
 - initial release