Changeset 801

Timestamp:

09/06/08 15:00:54 (3 months ago)

Author:

free

Message:

Added _Apt class

Location:

ares/trunk

Files:

• ares.py (modified) (3 diffs)
• tests/TestAres.py (modified) (1 diff)

ares/trunk/ares.py

@@ -63 +63 @@
         self.samba        = _Samba(self)
         self.nfs          = _Nfs(self)
+        self.havp         = _Havp(self)
+        self.apt          = _Apt(self)
         self.postconfig   = _Postconfig(self)
 
@@ -542 +544 @@
 
 #
+# Havp
+#
+class _Havp:
+
+    def __init__(self, ares):
+        self._ares = ares
+        self._cfg  = '/files/etc/havp/havp.config'
+
+    def setup(self):
+
+        aug = self._ares.aug
+        cfg = self._cfg
+        aug.set(cfg + '/PARENTPROXY', 'localhost')
+        aug.set(cfg + '/PARENTPORT', '3128')
+
+#
+# Setup the APT repository
+#
+class _Apt:
+
+    def __init__(self, ares):
+        self._ares = ares
+        self._cfg = '/files/etc/apt/sources.list'
+
+    def setup(self):
+        cfg = self._cfg
+        aug = self._ares.aug
+
+        # Remove all previous entries
+        for key in aug.match(cfg + '/*'):
+            aug.remove(key)
+        id  = '/1'
+
+        # Leave only our one
+        aug.set(cfg + id + '/type', 'deb')
+        aug.set(cfg + id + '/uri',  self._ares.repo)
+        aug.set(cfg + id + '/distribution', self._ares.suite)
+        aug.set(cfg + id + '/component', 'main')
+
+#
 # Postconfig
 #
@@ -550 +592 @@
 
     def setup(self):
+
+        # Do not log low-level kernel messages
+        cfg = self._ares.root + 'etc/init.d/klogd'
+        cmd = 'sed -i -e \'s|^KLOGD=.*|KLOGD="-c 4 -s"|g\' %s' % cfg
+        if os.system(cmd) != 0:
+            raise AresError('F: %s' % cmd)
 
         # Stop here if we not running as root

ares/trunk/tests/TestAres.py

@@ -28 +28 @@
         ares.samba.setup()
         ares.nfs.setup()
+        ares.havp.setup()
+        ares.apt.setup()
         ares.aug.save()
         ares.postconfig.setup()