[Oval-commits] r221 - in trunk/oval-server: . debian

[Javier Fernandez-Sanguino Pen~a]

Author: jfs
Date: 2007-08-23 19:54:25 +0000 (Thu, 23 Aug 2007)
New Revision: 221

Modified:
   trunk/oval-server/debian/dirs
   trunk/oval-server/debian/oval-server.init
   trunk/oval-server/debian/rules
   trunk/oval-server/oval-server.cfg
Log:
Create directories for the server on the package, adjust the locations in the default configuration file and install the configuration file on install

Modified: trunk/oval-server/debian/dirs
===================================================================
--- trunk/oval-server/debian/dirs	2007-08-23 19:50:54 UTC (rev 220)
+++ trunk/oval-server/debian/dirs	2007-08-23 19:54:25 UTC (rev 221)
@@ -3,3 +3,7 @@
 etc/init.d
 etc/oval
 var/log/oval
+var/cache/oval/server/definitions
+var/cache/oval/server/repos
+var/cache/oval/server/dsa
+var/lib/oval/server/

Modified: trunk/oval-server/debian/oval-server.init
===================================================================
--- trunk/oval-server/debian/oval-server.init	2007-08-23 19:50:54 UTC (rev 220)
+++ trunk/oval-server/debian/oval-server.init	2007-08-23 19:54:25 UTC (rev 221)
@@ -24,7 +24,7 @@
 OVALSERVER_ENABLE=false
 #OVALAGENT_USER=debtorrent
 OVALSERVER_CONFIG_FILE=/etc/oval/oval-server.conf
-OVALSERVER_LOG_DIR=/var/log/oval
+OVALSERVER_LOG_DIR=/var/log/oval/
 
 test -x $DAEMON || exit 0
 

Modified: trunk/oval-server/debian/rules
===================================================================
--- trunk/oval-server/debian/rules	2007-08-23 19:50:54 UTC (rev 220)
+++ trunk/oval-server/debian/rules	2007-08-23 19:54:25 UTC (rev 221)
@@ -37,6 +37,7 @@
 	dh_installdirs
 
 	./setup.py install --prefix=$(CURDIR)/debian/oval-server/usr --install-lib=$(CURDIR)/debian/oval-server/usr/share/python-support/oval-server
+	install -m644 oval-server.cfg $(CURDIR)/debian/etc/oval/oval-server.conf
 
 	# Remove the generated .pyc files
 	( cd debian/oval-server/usr/share/python-support/oval-server/oval && \

Modified: trunk/oval-server/oval-server.cfg
===================================================================
--- trunk/oval-server/oval-server.cfg	2007-08-23 19:50:54 UTC (rev 220)
+++ trunk/oval-server/oval-server.cfg	2007-08-23 19:54:25 UTC (rev 221)
@@ -1,21 +1,21 @@
 [general]
-log_dir = /tmp/oval/server/log
+log_dir = /var/log/oval/
 log_file = oval-server.log
 #log_level = CRITICAL | ERROR | WARNING (default) | INFO | DEBUG | NOTSET
 log_level = INFO
-dsa_storage = /tmp/oval/server/dsa
-db = /tmp/oval/server/oval-server.db
+dsa_storage = /var/cache/oval/server/dsa
+db = /var/lib/oval/server/oval-server.db
 
 [server]
 type = http
 ip = 127.0.0.1
 port = 8989
-workdir = /tmp/oval/server/definitions
+workdir = /var/cache/oval/server/definitions
 
 [source]
 type = local
 name = "Local OVAL definitions source"
-source = /tmp/oval/server/repos
+source = /var/cache/oval/server/repos
 update_interval = 1
 
 #type = http