[Oval-commits] r161 - in trunk/oval-server: . dsa2oval/definition
Pavel Vinogradov
blaze-guest at alioth.debian.org
Mon Aug 20 07:03:28 UTC 2007
Author: blaze-guest
Date: 2007-08-20 07:03:28 +0000 (Mon, 20 Aug 2007)
New Revision: 161
Modified:
trunk/oval-server/dsa2oval/definition/differ.py
trunk/oval-server/oval-server.cfg
trunk/oval-server/oval-server.py
Log:
Updates in definitions generator
Modified: trunk/oval-server/dsa2oval/definition/differ.py
===================================================================
--- trunk/oval-server/dsa2oval/definition/differ.py 2007-08-20 05:54:30 UTC (rev 160)
+++ trunk/oval-server/dsa2oval/definition/differ.py 2007-08-20 07:03:28 UTC (rev 161)
@@ -72,6 +72,5 @@
self.__equal = equalC
self.__differ = differC
else:
- logging.log(logging.DEBUG, "Architecture " + architecture + " too differens")
self.__differ[architecture] = packages
return (1)
Modified: trunk/oval-server/oval-server.cfg
===================================================================
--- trunk/oval-server/oval-server.cfg 2007-08-20 05:54:30 UTC (rev 160)
+++ trunk/oval-server/oval-server.cfg 2007-08-20 07:03:28 UTC (rev 161)
@@ -1,26 +1,19 @@
[general]
-log_dir = /tmp
+log_dir = /home/blaze/tmp/oval/server/log
log_file = oval-server.log
log_level = INFO
-dsa_storage = /tmp/dsa
+dsa_storage = /home/blaze/tmp/oval/server/dsa
[server]
type = http
ip = 127.0.0.1
port = 8989
-workdir = /tmp/dsa
+workdir = /home/blaze/oval/server/definitions
-[agents]
-agent_active = server, laptop
-ip_server = 192.168.17.1
-ip_laptop = 192.168.17.10
-descr_server = server.home.nixdev.net
-descr_laptop = laptop.home.nixdev.net
-
[source]
type = local
name = "Local OVAL definitions source"
-source = /home/blaze/opt/webwml/english/security
+source = /home/blaze/tmp/oval/server/repos
update_interval = 10m
Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py 2007-08-20 05:54:30 UTC (rev 160)
+++ trunk/oval-server/oval-server.py 2007-08-20 07:03:28 UTC (rev 161)
@@ -1,5 +1,7 @@
from ConfigParser import SafeConfigParser
from threading import Thread
+from dba import dba
+from dsa2oval import convertor
import os, logging
import time
@@ -48,10 +50,20 @@
def run (self):
self.__status = 1
+ self.db = dba.dba ('/tmp/oval-server.db')
+ conv = convertor.Dsa2Oval ('/home/blaze/tmp/oval/server/dsa', '/home/blaze/tmp/oval/server/definitions')
while self.__status:
self.logger.debug('syncThread: Run local sync')
self.syncer.sync()
+
+ self.logger.debug('syncThread: Run agent sync')
+# for agent in self.db.getAgentsList():
+# self.logger.debug('syncThread: Sync definitions for agent %s' % agent[1])
+# files = self.db.makeDefList(int(agent[0]))
+# data = conv.createDefList(files)
+# conv.saveOvalDef('/tmp/dsa/%s.xml' % agent[1])
+
self.logger.debug('syncThread: sleep')
time.sleep(60*1)
More information about the Oval-commits
mailing list