[packages/ocs-inventory-ng] - combine apache config files, create dbconfig.inc.php, drop install.php

[adamg]

commit a520d0730948897c8daebba285b3fa57ada940f9
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Fri Mar 1 14:08:44 2013 +0100

    - combine apache config files, create dbconfig.inc.php, drop install.php

 ocs-inventory-ng.spec | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/ocs-inventory-ng.spec b/ocs-inventory-ng.spec
index 29c3f62..4f310a0 100644
--- a/ocs-inventory-ng.spec
+++ b/ocs-inventory-ng.spec
@@ -104,6 +104,20 @@ sed -e 's,OCSREPORTS_ALIAS,/ocsreports,g' \
     -e 's,PATH_TO_PACKAGES_DIR,/var/lib/ocs-inventory-ng/,g' \
     -i etc/ocsinventory/ocsinventory-reports.conf
 
+# combine apache files
+cat etc/ocsinventory/ocsinventory-{server,reports}.conf > etc/ocsinventory/ocsinventory.conf
+
+# prepare db config and drop install.php
+rm ocsreports/install.php
+cat > ocsreports/dbconfig.inc.php << 'EOF'
+<?php
+define('DB_NAME', 'ocsweb');
+define('SERVER_READ', 'localhost');
+define('SERVER_WRITE', 'localhost');
+define('COMPTE_BASE', 'ocs');
+define('PSWD_BASE', 'ocs');
+EOF
+
 %build
 cd Apache
 %{__perl} Makefile.PL \
@@ -129,11 +143,10 @@ cp -a PluginOcsOfficekey-2.2.4/ms_plugins/ms_plugins_packoffice.php $RPM_BUILD_R
 cp -a PluginOcsOfficekey-2.2.4/img/ms_* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/main_sections/img/
 
 install etc/logrotate.d/ocsinventory-server $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ocs-inventory-ng
-install etc/ocsinventory/ocsinventory-server.conf $RPM_BUILD_ROOT%{_webappconfdir}/apache.conf
-install etc/ocsinventory/ocsinventory-server.conf $RPM_BUILD_ROOT%{_webappconfdir}/httpd.conf
+install etc/ocsinventory/ocsinventory.conf $RPM_BUILD_ROOT%{_webappconfdir}/apache.conf
+install etc/ocsinventory/ocsinventory.conf $RPM_BUILD_ROOT%{_webappconfdir}/httpd.conf
 install binutils/ipdiscover-util.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/ipdiscover-util.pl
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocs-inventory-ng.git/commitdiff/a520d0730948897c8daebba285b3fa57ada940f9