packages: nagios-vshell/config.patch, nagios-vshell/nagios-vshell.spec, nag...

[glen]

Author: glen                         Date: Sat Jan  7 17:42:10 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- still package files under nagios dirs, and use it's auth methods

---- Files affected:
packages/nagios-vshell:
   config.patch (1.2 -> 1.3) , nagios-vshell.spec (1.5 -> 1.6) , apache.conf (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/nagios-vshell/config.patch
diff -u packages/nagios-vshell/config.patch:1.2 packages/nagios-vshell/config.patch:1.3
--- packages/nagios-vshell/config.patch:1.2	Sat Jan  7 18:21:52 2012
+++ packages/nagios-vshell/config.patch	Sat Jan  7 18:42:05 2012
@@ -37,7 +37,7 @@
  // All other setting should be adjusted by editing vshell.conf
  // Switch to use external configuration file by Tony Yarusso, 30 March 2011
 -$ini_array = parse_ini_file("/etc/vshell.conf");
-+$ini_array = parse_ini_file("/etc/webapps/nagios-vshell/vshell.conf");
++$ini_array = parse_ini_file("/etc/webapps/nagios/vshell.conf");
  
  define('VERSION', '1.8'); 
  

================================================================
Index: packages/nagios-vshell/nagios-vshell.spec
diff -u packages/nagios-vshell/nagios-vshell.spec:1.5 packages/nagios-vshell/nagios-vshell.spec:1.6
--- packages/nagios-vshell/nagios-vshell.spec:1.5	Sat Jan  7 18:21:55 2012
+++ packages/nagios-vshell/nagios-vshell.spec	Sat Jan  7 18:42:05 2012
@@ -5,12 +5,11 @@
 Summary:	Nagios V-Shell
 Name:		nagios-%{pkg}
 Version:	1.8
-Release:	0.5
+Release:	0.7
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://assets.nagios.com/downloads/exchange/nagiosvshell/%{pkg}.tar.gz
 # Source0-md5:	802a80daa263b441af1b729cb3e7fa35
-Source1:	apache.conf
 Patch0:		config.patch
 Patch1:		http-host.patch
 URL:		http://exchange.nagios.org/directory/Addons/Frontends-(GUIs-and-CLIs)/Web-Interfaces/Nagios-V-2DShell/details
@@ -23,8 +22,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_webapps	/etc/webapps
-%define		_webapp		nagios-%{pkg}
-%define		_sysconfdir	%{_webapps}/%{_webapp}
+%define		_sysconfdir	%{_webapps}/nagios
 %define		_appdir		%{_datadir}/nagios/%{pkg}
 
 %description
@@ -52,30 +50,13 @@
 cp -a controllers css data js locale views $RPM_BUILD_ROOT%{_appdir}
 
 cp -p config/vshell.conf $RPM_BUILD_ROOT%{_sysconfdir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- apache1 < 1.3.37-3, apache1-base
-%webapp_register apache %{_webapp}
-
-%triggerun -- apache1 < 1.3.37-3, apache1-base
-%webapp_unregister apache %{_webapp}
-
-%triggerin -- apache < 2.2.0, apache-base
-%webapp_register httpd %{_webapp}
-
-%triggerun -- apache < 2.2.0, apache-base
-%webapp_unregister httpd %{_webapp}
-
 %files
 %defattr(644,root,root,755)
 %doc INSTALL.txt doc/*
-%dir %attr(750,root,http) %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{pkg}.conf
 %{_appdir}
 
@@ -85,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/01/07 17:42:05  glen
+- still package files under nagios dirs, and use it's auth methods
+
 Revision 1.5  2012/01/07 17:21:55  glen
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-vshell/config.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-vshell/nagios-vshell.spec?r1=1.5&r2=1.6&f=u