rpms/ocsinventory/devel ocsinventory-path.patch, NONE, 1.1 ocsinventory-reports.conf, NONE, 1.1 ocsinventory.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Jun 24 05:07:55 UTC 2008

Author: remi

Update of /cvs/extras/rpms/ocsinventory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21533

Modified Files:
	.cvsignore sources 
Added Files:
	ocsinventory-path.patch ocsinventory-reports.conf 
	ocsinventory.spec 
Log Message:
initial import

ocsinventory-path.patch:

--- NEW FILE ocsinventory-path.patch ---
--- ocsreports/files/ocsbase.sql	2008/06/11 17:10:42	1.25
+++ ocsreports/files/ocsbase.sql	2008/06/14 13:38:13	1.26
@@ -751,7 +751,7 @@
 
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('DOWNLOAD_SERVER_URI','','$IP$/local','Server url used for group of server');
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('DOWNLOAD_SERVER_DOCROOT','','d:\\\\tele_ocs','Server directory used for group of server');
-insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('DOWNLOAD_PACK_DIR','','/var/lib/ocsinventory-server','Directory for download files');
+insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('DOWNLOAD_PACK_DIR','','/var/lib/ocsinventory-reports','Directory for download files');
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('LOCK_REUSE_TIME',600,'','Validity of a computer\'s lock');
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('INVENTORY_DIFF',1,'','Configure engine to update inventory regarding to CHECKSUM agent value (lower DB backend load)');
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('INVENTORY_TRANSACTION',1,'','Make engine consider an inventory as a transaction (lower concurency, better disk usage)');
@@ -764,7 +764,7 @@
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('IPDISCOVER_BETTER_THRESHOLD',1,'','Specify the minimal difference to replace an ipdiscover agent');
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('IPDISCOVER_NO_POSTPONE',0,'','Disable the time before a first election (not recommended)');
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('IPDISCOVER_USE_GROUPS',1,'','Enable groups for ipdiscover (for example, you might want to prevent some groups');
-insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('IPDISCOVER_IPD_DIR','','/var/lib/ocsinventory-server','Directory for Ipdiscover files');
+insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('IPDISCOVER_IPD_DIR','','/var/lib/ocsinventory-reports','Directory for Ipdiscover files');
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('GENERATE_OCS_FILES',0,'','Use with ocsinventory-local, enable the multi entities feature');
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('OCS_FILES_FORMAT','','OCS','Generate either compressed file or clear XML text');
 insert into config (NAME,IVALUE,TVALUE,COMMENTS) values ('OCS_FILES_OVERWRITE',0,'','Specify if you want to keep trace of all inventory between to synchronisation with the higher level server');
--- README	2008/03/05 00:02:02	1.6
+++ README	2008/06/14 13:39:17	1.7
@@ -25,7 +25,7 @@
 document directory.
 If you choose to move directory, YOU MUST MOVE 'download' directory to 
 Administration Server variable/cache directory (by default 
-/var/lib/ocsinventpry-server), especialy if you use deployement feature.
+/var/lib/ocsinventory-reports), especialy if you use deployement feature.
 ================================================================================
 
 
@@ -75,9 +75,9 @@
 - Communication Server logs are stored under directory 
   /var/log/ocsinventory-server
 - PHP files are installed under directory 
-  /usr/share/ocsinventory-server/ocsreports
+  /usr/share/ocsinventory-reports/ocsreports
 - Writable/cache directories "download" and "ipd" are created under directory 
-  /var/lib/ocsinventory-server
+  /var/lib/ocsinventory-reports
 - Administration Server configuration file ocsinventory-reports.conf is 
   installed under Apache configuration directory, usually /etc/httpd/conf.d or
   /etc/apache[2]/conf.d. It contains aliases for /ocsreports and /download URL.
--- setup.sh	2008/03/26 21:34:01	1.18
+++ setup.sh	2008/06/14 13:59:36	1.20
@@ -50,11 +50,11 @@
 # Administration Console Apache configuration file
 ADM_SERVER_APACHE_CONF_FILE="ocsinventory-reports.conf"
 # Administration console read only files directory
-ADM_SERVER_STATIC_DIR="/usr/share/ocsinventory-server"
+ADM_SERVER_STATIC_DIR="/usr/share/ocsinventory-reports"
 ADM_SERVER_STATIC_REPORTS_DIR="ocsreports"
 ADM_SERVER_REPORTS_ALIAS="/ocsreports"
 # Administration console read/write files dir
-ADM_SERVER_VAR_DIR="/var/lib/ocsinventory-server"
+ADM_SERVER_VAR_DIR="/var/lib/ocsinventory-reports"
 # Administration default packages directory and Apache alias
 ADM_SERVER_VAR_PACKAGES_DIR="download"
 ADM_SERVER_PACKAGES_ALIAS="/download"
@@ -981,7 +981,7 @@
     else
        ADM_SERVER_STATIC_DIR="$ligne"
     fi
-    echo "OK, PHP files copied into $ADM_SERVER_STATIC_DIR/$ADM_SERVER_STATIC_REPORTS_DIR ;-)"
+    echo "OK, using directory $ADM_SERVER_STATIC_DIR to install static files ;-)"
     echo "Using directory $ADM_SERVER_STATIC_DIR for static files" >> $SETUP_LOG
 
     echo "Where to create writable/cache directories for deployement packages and"


--- NEW FILE ocsinventory-reports.conf ---
################################################################################
#
# OCS Inventory NG Administration Server
#
# Copyleft 2008 OCS Inventory NG Team
# Web: http://www.ocsinventory-ng.org
#
# This code is open source and may be copied and modified as long as the source
# code is always made freely available.
# Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt
################################################################################

#
# ANY CHANGE ON THIS FILE REQUIRES APACHE RESTART TO TAKE EFFECT
#

################################################################################
# Administration console public pages
# 

# Uncomment if you want a virtual host for OCS Inventory NG
#<VirtualHost *:80>
#        ServerName   ocsinventory-ng
#        ServerAlias  ocsinventory-ng.yourdomain.tld
#        DocumentRoot PATH_TO_OCSREPORTS_DIR
#        AddDefaultCharset ISO-8859-1

Alias OCSREPORTS_ALIAS PATH_TO_OCSREPORTS_DIR

<Directory PATH_TO_OCSREPORTS_DIR>
    # By default, users can use console from everywhere
    Order deny,allow
    Allow from all
    
    Options Indexes FollowSymLinks
    DirectoryIndex index.php
    
    # Uncomment following to force use of HTTPS in Administration Server
    #SSLRequireSSL
    
        php_flag short_open_tag         on
        php_flag file_uploads           on

        # Some PHP tuning for deployement feature up to 50 MB
        php_value post_max_size         51M
        php_value upload_max_filesize   50M

        # You may have to uncomment following on errors
        #php_value memory_limit          16M
        #php_value max_execution_time    -1
        #php_value max_input_time 	     -1

    # Uncomment following to allow HTTP body request up to 4 MB
    # instead default 512 KB
    #LimitRequestBody 4194304
</Directory>

################################################################################
# Deployment packages download area
# 
Alias PACKAGES_ALIAS PATH_TO_PACKAGES_DIR

#</VirtualHost>



--- NEW FILE ocsinventory.spec ---
%if %{?fedora}%{?rhel} >= 5
%define useselinux 1
%else
%define useselinux 0
%endif

%define tarname OCSNG_UNIX_SERVER_1.02_RC2

Name:        ocsinventory
Summary:     Open Computer and Software Inventory Next Generation

Version:     1.02
Release:     0.5.rc2%{?dist}

Group:       Applications/Internet
License:     GPLv2
URL:         http://www.ocsinventory-ng.org/

Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
Source1:     ocsinventory-reports.conf

# http://ocsinventory.cvs.sourceforge.net/ocsinventory/server/ocsreports/files/ocsbase.sql?r1=1.25&r2=1.26&view=patch&sortby=date
# http://ocsinventory.cvs.sourceforge.net/ocsinventory/server/README?r1=1.6&r2=1.7&view=patch&sortby=date
# http://ocsinventory.cvs.sourceforge.net/ocsinventory/server/setup.sh?r1=1.18&r2=1.20&view=patch&sortby=date
Patch0:      ocsinventory-path.patch

BuildArch:   noarch
BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Apache::DBI)
BuildRequires: perl(DBD::mysql)
BuildRequires: perl(Net::IP)
BuildRequires: perl(XML::Simple)

# Main package is a dummy package
Requires:    ocsinventory-server  = %{version}-%{release}
Requires:    ocsinventory-reports = %{version}-%{release}
Requires:    mysql-server


%description
Open Computer and Software Inventory Next Generation is an application
designed to help a network or system administrator keep track of the
computers configuration and software that are installed on the network.

OCS Inventory is also able to detect all active devices on your network,
such as switch, router, network printer and unattended devices.

OCS Inventory NG includes package deployment feature on client computers.

ocsinventory is a metapackage that will install the communication server,
the administration console and the database server (MySQL).

%description -l fr
Open Computer and Software Inventory Next Generation est une application 
dÃ©stinÃ©e Ã  aider l'administrateur systÃ¨me ou rÃ©seau Ã  garder un oeil 
sur la configuration des machines du rÃ©seau et sur les logiciels qui y
sont installÃ©s.

OCS Inventory est aussi capable de dÃ©tecter tout pÃ©riphÃ©rique actif sur
le rÃ©seau, comme les commutateurs, routeurs, imprimantes et autres matÃ©riels
autonomes.

OCS Inventory NG intÃ¨gre des fonctionnalitÃ©s de tÃ©lÃ©diffusion de paquets
sur les machines clients.

ocsinventory est un metapaquet qui installera le serveur de communication, 
la console d'administration et le serveur de base de donnÃ©es (MySQL).

%package server
Group:    Applications/Internet
Summary:  OCS Inventory NG - Communication server
Requires: mod_perl
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# Required by the original setup script, but not detected automatically :
# Apache::DBI drags in DBI
Requires: perl(Apache::DBI)
Requires: perl(Net::IP)
Requires: perl(DBD::mysql)
# Optional, not detected automatically :
Requires: perl(SOAP::Lite)
Requires: perl(XML::Entities)
%if %{useselinux}
Requires: policycoreutils
%endif

%description server
This package provides the Communication server, which will handle HTTP
communications between database server and agents.

%description -l fr server
Ce paquet fournit le serveur de communication (Communication server), 
qui gÃ¨re les communications HTTP entre les agents et le serveur de base
de donnÃ©es.


%package reports
Group:    Applications/Internet
Summary:  OCS Inventory NG - Communication server
# From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib 
Requires: php
Requires: php-mysql php-zip php-xml php-gd 
# Required by the original setup script, but not detected automatically :
Requires: perl(DBD::mysql)
# Required by ipdiscover-util.pl (nmap and nmblookup)
Requires: nmap samba-client
%if %{useselinux}
Requires: policycoreutils
%endif

%description reports
This package provides the Administration console, which will allow 
administrators to query the database server through their favorite browser.

%description -l fr reports
Ce paquet fournit la console d'administration (Administration console), 
qui autorise les administrateurs Ã  interroger la base de donnÃ©es via leur
navigateur favori.


%prep
%setup -q -n %{tarname}

%patch0 -p0

cat <<EOF >dbconfig.inc.php
<?php
\$_SESSION["SERVEUR_SQL"]="";
\$_SESSION["COMPTE_BASE"]="ocs";
\$_SESSION["PSWD_BASE"]="ocs";
?>
EOF


%build
cd Apache
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

# --- ocsinventory-server --- communication server
cd Apache
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'

chmod -R u+rwX,go+rX,go-w %{buildroot}/*
find %{buildroot}%{perl_vendorlib}/Apache -name \*.pm -exec chmod -x {} \;

%if 0%{?rhel} == 4
# To avoid bad dependency on perl(mod_perl2)
rm -f %{buildroot}%{perl_vendorlib}/Apache/Ocsinventory/Server/Modperl2.pm
%else
# To avoid bad dependency on perl(mod_perl) : RHEL >= 5 && Fedora >= 4
rm -f %{buildroot}%{perl_vendorlib}/Apache/Ocsinventory/Server/Modperl1.pm
%endif

%{__mkdir_p} %{buildroot}%{_localstatedir}/log/ocsinventory-server

%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d
%{__sed} -e 's;PATH_TO_LOG_DIRECTORY;%{_localstatedir}/log/ocsinventory-server;' \
   ./etc/logrotate.d/ocsinventory-server >%{buildroot}%{_sysconfdir}/logrotate.d/ocsinventory-server

# default configuration (localhost) should work on "simple" installation
%{__mkdir_p} %{buildroot}%{_sysconfdir}/httpd/conf.d
%{__sed} -e "s;DATABASE_SERVER;localhost;g" \
    -e "s;DATABASE_PORT;3306;g" \
%if 0%{?rhel} == 4
    -e "s;VERSION_MP;1;g" \
%else
    -e "s;VERSION_MP;2;g" \
%endif
    -e "s;PATH_TO_LOG_DIRECTORY;%{_localstatedir}/log/ocsinventory-server;g" \
    ./etc/ocsinventory/ocsinventory-server.conf | \
    grep -v IfModule >%{buildroot}%{_sysconfdir}/httpd/conf.d/ocsinventory-server.conf
cd ..

# --- ocsinventory-reports --- administration console

%{__mkdir_p} %{buildroot}/%{_datadir}/ocsinventory-reports
cp -ar ocsreports %{buildroot}/%{_datadir}/ocsinventory-reports
find %{buildroot}/%{_datadir}/ocsinventory-reports \( -name \*.php -o -name \*.css \) -exec chmod -x {} \;

%{__mkdir_p} %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports
%{__install} -m640 dbconfig.inc.php \
   %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
ln -s ../../../../%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/dbconfig.inc.php

%{__mkdir_p} %{buildroot}%{_localstatedir}/lib/ocsinventory-reports/{download,ipd}

%{__install} -pm 755 Apache/binutils/ipdiscover-util.pl %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/ipdiscover-util.pl

%{__mkdir_p} %{buildroot}%{_sysconfdir}/httpd/conf.d
%{__sed} -e "s;OCSREPORTS_ALIAS;/ocsreports;g" \
         -e "s;PATH_TO_OCSREPORTS_DIR;%{_datadir}/ocsinventory-reports/ocsreports;g" \
         -e "s;PACKAGES_ALIAS;/download;g" \
         -e "s;PATH_TO_PACKAGES_DIR;%{_localstatedir}/lib/ocsinventory-reports/download;g" \
    %{SOURCE1} >%{buildroot}%{_sysconfdir}/httpd/conf.d/ocsinventory-reports.conf


%clean
rm -rf %{buildroot}


%post server
%if %{useselinux}
(
# New File context
semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
# files created by app
restorecon -R %{_localstatedir}/log/ocsinventory-server
) ||:
%endif


%post reports
%if %{useselinux}
(
# New File context
semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?"
semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/ocsinventory-server(/.*)?"
# files created by app
restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports
restorecon -R %{_localstatedir}/lib/ocsinventory-server
) ||:
%endif


%postun server
%if %{useselinux}
if [ "$1" -eq "0" ]; then
    # Remove the File Context
    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" || :
fi
%endif


%postun reports
%if %{useselinux}
if [ "$1" -eq "0" ]; then
    # Remove the File Context
    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" ||:
    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" ||:
fi
%endif


%files
%defattr(-, root, root, -)


%files server
%defattr(-, root, root, -)
%doc LICENSE.txt README
%config(noreplace) %{_sysconfdir}/logrotate.d/ocsinventory-server
%config(noreplace) %{_sysconfdir}/httpd/conf.d/ocsinventory-server.conf
%attr(755,apache,root) %{_localstatedir}/log/ocsinventory-server
%{perl_vendorlib}/Apache


%files reports
%defattr(-, root, root, -)
%doc LICENSE.txt README
%dir %{_sysconfdir}/ocsinventory
%dir %{_sysconfdir}/ocsinventory/ocsinventory-reports
%attr(640,apache,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
%config(noreplace) %{_sysconfdir}/httpd/conf.d/ocsinventory-reports.conf
%{_datadir}/ocsinventory-reports
%attr(755,apache,root) %dir %{_localstatedir}/lib/ocsinventory-reports
%attr(755,apache,root) %dir %{_localstatedir}/lib/ocsinventory-reports/ipd
%attr(755,apache,root) %dir %{_localstatedir}/lib/ocsinventory-reports/download


%changelog
* Sat Jun 14 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.5.rc2
- change dir from /var/lib/ocsinventory-server to /var/lib/ocsinventory-reports
- add Requires nmap and samba-client (nmblookup)

* Sun May 18 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.4.rc2
- remove <IfModule> from ocsinventory-server.conf
- change perm to 755 on /var/lib/ocsinventory-server
- metapackage description closer to upstream components name
- add BR perl(DBD::mysql) to avoid build warning

* Fri May 16 2008 Xavier Bachelot <xavier at bachelot.org> 1.02-0.3.rc2.1
- Fix BuildRequires and Requires.
- Fix %%description french translations and a few typos.
- Rename apache confs.

* Sat May 10 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.3.rc2
- add missing requires for php extensions (from PHP_Compat result)
- add selinux stuff

* Thu May 08 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.2.rc2
- update to RC2

* Sun Mar 15 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.2.rc1
- fix download dir

* Sat Mar  8 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.1.rc1
- Initial RPM



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jun 2008 19:15:31 -0000	1.1
+++ .cvsignore	24 Jun 2008 05:07:04 -0000	1.2
@@ -0,0 +1 @@
+OCSNG_UNIX_SERVER_1.02_RC2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jun 2008 19:15:31 -0000	1.1
+++ sources	24 Jun 2008 05:07:04 -0000	1.2
@@ -0,0 +1 @@
+4c582d29db7777506b5cfe49f15af3c4  OCSNG_UNIX_SERVER_1.02_RC2.tar.gz


