[Nagios-checkins] CVS: nagios nagios.spec,1.16,1.17

[Karl D. <kde...@us...>]

Update of /cvsroot/nagios/nagios
In directory sc8-pr-cvs1:/tmp/cvs-serv17653

Modified Files:
	nagios.spec 
Log Message:
merger in relevent chab=nges from stable branch


Index: nagios.spec
===================================================================
RCS file: /cvsroot/nagios/nagios/nagios.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** nagios.spec	2 Dec 2002 04:30:01 -0000	1.16
--- nagios.spec	31 May 2003 15:11:35 -0000	1.17
***************
*** 4,7 ****
--- 4,10 ----
  %define nsusr nagios
  %define nsgrp nagios
+ %define cmdgrp nagiocmd
+ %define wwwusr apache
+ %define wwwgrp apache
  
  # Performance data handling method to use. By default we will use
***************
*** 99,103 ****
  %pre
  # Create `nagios' user on the system if necessary
! if id %{nsusr} ; then
  	: # user already exists
  else
--- 102,106 ----
  %pre
  # Create `nagios' user on the system if necessary
! if /usr/bin/id %{nsusr} > /dev/null 2>&1 ; then
  	: # user already exists
  else
***************
*** 106,109 ****
--- 109,116 ----
  fi
  
+ # id cannot tell us if the group already exists
+ # so just try to create it and assume it works
+ /usr/sbin/groupadd %{cmdgrp} > /dev/null 2>&1
+  
  # if LSB standard /etc/init.d does not exist,
  # create it as a symlink to the first match we find
***************
*** 130,154 ****
  fi
  # Delete nagios user and group
  if [ $1 = 0 ]; then
! 	/usr/sbin/userdel %{nsusr} || %nnmmsg "User %{nsusr} could not be deleted."
! 	/usr/sbin/groupdel %{nsgrp} || %nnmmsg "Group %{nsgrp} could not be deleted."
  fi
! 
  
  %post www
! if ! /usr/bin/id -Gn %{cmdusr} |/bin/grep -q %{nsgrp} ; then 
! 	/usr/sbin/usermod -G %{nsgrp} %{cmdusr} >/dev/null 2>&1 
! 	%nnmmsg "User %{cmdusr} added to group %{nsgrp} so sending commands to Nagios from the command CGI is possible."
! fi
! cmdgrp=`awk '/^[ \t]*Group[ \t]+[a-zA-Z0-9]+/ {print $2}' /etc/httpd/conf/*.conf`
! if test -z "$cmdgrp"; then
! 	cmdgrp=%{cmdgrp}
  fi
! 
! if test -f /etc/httpd/conf/httpd.conf; then
! 	if ! grep "Include /etc/httpd/(conf.d|*)/nagios.conf" /etc/httpd/conf/httpd.conf > /dev/null; then
! 		echo "Include /etc/httpd/conf.d/nagios.conf" >> /etc/httpd/conf/httpd.conf
! 		/sbin/service httpd restart
  	fi
  fi
  
--- 137,170 ----
  fi
  # Delete nagios user and group
+ # (if grep doesn't find a match, then it is NIS or LDAP served and cannot be deleted)
  if [ $1 = 0 ]; then
! 	/bin/grep '^%{nsusr}:' /etc/passwd > /dev/null 2>&1 && /usr/sbin/userdel %{nsusr} || %nnmmsg "User %{nsusr} could not be deleted."
! 	/bin/grep '^%{nsgrp}:' /etc/group > /dev/null 2>&1 && /usr/sbin/groupdel %{nsgrp} || %nnmmsg "Group %{nsgrp} could not be deleted."
! 	/bin/grep '^%{cmdgrp}:' /etc/group > /dev/null 2>&1 && /usr/sbin/groupdel %{cmdgrp} || %nnmmsg "Group %{cmdgrp} could not be deleted."
  fi
!  
  
  %post www
! # If apache is installed, and we can find the apache user, set a shell var
! wwwusr=`awk '/^[ \t]*User[ \t]+[a-zA-Z0-9]+/ {print $2}' /etc/httpd/conf/*.conf`
! if [ "z" == "z$wwwusr" ]; then # otherwise, use the default
! 	wwwusr=%{wwwusr}
  fi
! # if apache user is not in cmdgrp, add it
! if /usr/bin/id -Gn $wwwusr 2>/dev/null | /bin/grep -q %{cmdgrp} > /dev/null 2>&1 ; then
! 	: # $wwwusr (default: apache) is already in nagiocmd group
! else
! 	# first find apache primary group
! 	pgrp=`/usr/bin/id -gn $wwwusr 2>/dev/null`
! 	# filter apache primary group from secondary groups
! 	sgrps=`/usr/bin/id -Gn $wwwusr 2>/dev/null | /bin/sed "s/^$pgrp //;s/ $pgrp //;s/^$pgrp$//;s/ /,/g;"`
! 	if [ "z" == "z$sgrps" ] ; then
! 		sgrps=%{nsgrp}
! 	else
! 		sgrps=$sgrps,%{cmdgrp}
  	fi
+ 	# modify apache user, adding it to cmdgrp
+ 	/usr/sbin/usermod -G $sgrps $wwwusr >/dev/null 2>&1
+ 	%nnmmsg "User $wwwusr added to group %{cmdgrp} so sending commands to Nagios from the command CGI is possible."
  fi
  
***************
*** 178,183 ****
  	--with-nagios-user=%{nsusr} \
  	--with-nagios-grp=%{nsgrp} \
- 	--with-command-user=%{cmdusr} \
- 	--with-command-grp=%{cmdgrp} \
  	--prefix=%{_prefix} \
  	--exec-prefix=%{_prefix}/sbin \
--- 194,197 ----
***************
*** 283,290 ****
  %if %{EMBPERL}
  %{_prefix}/sbin/p1.pl
- %{_prefix}/sbin/mini_epn
  %endif
  %dir %{_prefix}/lib/nagios/eventhandlers
  %{_prefix}/lib/nagios/eventhandlers/*
  %dir /etc/nagios
  %defattr(644,root,root)
--- 297,305 ----
  %if %{EMBPERL}
  %{_prefix}/sbin/p1.pl
  %endif
+ %{_prefix}/sbin/mini_epn
  %dir %{_prefix}/lib/nagios/eventhandlers
  %{_prefix}/lib/nagios/eventhandlers/*
+ %{_prefix}/lib/nagios/convertcfg
  %dir /etc/nagios
  %defattr(644,root,root)
***************
*** 297,301 ****
  %dir /var/log/nagios
  %dir /var/log/nagios/archives
! %defattr(2775,%{nsusr},%{cmdgrp})
  %dir /var/spool/nagios
  %doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
--- 312,316 ----
  %dir /var/log/nagios
  %dir /var/log/nagios/archives
! %defattr(2775,%{nsusr},%{nsgrp})
  %dir /var/spool/nagios
  %doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
***************
*** 319,322 ****
--- 334,351 ----
  
  %changelog
+ * Sat May 31 2003 Karl DeBisschop <kde...@us...> (1.1-1)
+ - Merge with CVS for 1.1 release
+ 
+ * Fri May 30 2003 Karl DeBisschop <kde...@us...> (1.0-4)
+ - cmdgrp was not always getting created
+ - patches for cmd.cgi and history.cgi
+ 
+ * Sat May 24 2003 Karl DeBisschop <kde...@us...> (1.0-3)
+ - patches for doco and PostgreSQL timestamp
+ - make sure all files are packaged (otherwise, will not build on RH9)
+ 
+ * Sat May 17 2003 Karl DeBisschop <kde...@us...> (1.0-2)
+ - patch for file descriptor leak
+ 
  * Fri Oct 04 2002 Karl DeBisschop <kde...@us...>
  - merge many improvements from Ramiro Morales <rm...@gm...>