Changeset 771

Timestamp:

09/04/08 11:40:24 (3 months ago)

Author:

free

Message:

Added _Hostname and _Dnsmasq classes

Location:

ares/trunk

Files:

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

ares/trunk/ares.py

@@ -37 +37 @@
         # Open an Augeas session
         if test:
-            self.root ='fakeroot/'
-            self.net  = '192.168.1.0/24'
+            self.root  ='fakeroot/'
+            self.net   = '192.168.1.0/24'
+            self.fqdn  = 'ares.clientdomain.com'
         else:
             self.root  = '/'
@@ -49 +50 @@
         # Setup classes
         self.ldap     = _Ldap(self)
-        self.squid     = _Squid(self)
+        self.squid    = _Squid(self)
+        self.hostname = _Hostname(self)
+        self.dnsmasq  = _Dnsmasq(self)
 
 if __name__ == '__main__':
@@ -221 +224 @@
             key = '%s/http_access[%d]/allow' % (cfg, len(aug.match(cfg + '/http_access')) + 1)
             aug.set(key, acl_name)
+
+#
+# Setup hostname
+#
+class _Hostname:
+
+    def __init__(self, ares):
+        self._ares = ares
+
+    def setup(self):
+        cfg = open(self._ares.root + 'etc/hostname', 'w+')
+        cfg.write("%s\n" % (self._ares.fqdn))
+        cfg.close()
+
+#
+# Setup squid
+#
+class _Dnsmasq:
+
+    def __init__(self, ares):
+        self._ares = ares
+        self._cfg  = '/files/etc/dnsmasq.conf'
+
+    def setup(self):
+        cfg = self._cfg
+        aug = self._ares.aug
+        for key in aug.match(cfg + '/#comment'):
+            if aug.get(key) == 'conf-dir=/etc/dnsmasq.d':
+                aug.move(key, cfg + '/conf-dir')
+        aug.set(cfg + '/conf-dir', '/etc/dnsmasq.d')

ares/trunk/tests/TestAres.py

@@ -17 +17 @@
         ares.ldap.setup()
         ares.squid.setup()
+        ares.hostname.setup()
+        ares.dnsmasq.setup()
         ares.aug.save()