Changeset 795

Timestamp:

09/06/08 13:08:45 (3 months ago)

Author:

free

Message:

Added _Samba class

Location:

ares/trunk

Files:

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

ares/trunk/ares.py

@@ -25 +25 @@
 import posixpath
 import ldap
+import grp
 
 __all__ = ['Ares']
@@ -59 +60 @@
         self.amavis       = _Amavis(self)
         self.spamassassin = _Spamassassin(self)
+        self.fetchmail    = _Fetchmail(self)
+        self.samba        = _Samba(self)
+        self.postconfig   = _Postconfig(self)
 
 if __name__ == '__main__':
@@ -426 +430 @@
         aug.set(cfg + '/ENABLED', '1')
         aug.set(cfg + '/CRON', '1')
+
+#
+# Fetchmail
+#
+class _Fetchmail:
+
+    def __init__(self, ares):
+        self._ares = ares
+        self._cfg  = '/files/etc/default/fetchmail'
+
+    def setup(self):
+
+        aug = self._ares.aug
+        cfg = self._cfg
+
+        aug.set(cfg + '/START_DAEMON', 'yes')
+        aug.set(cfg + '/OPTIONS', '"-d %d"' % 30)
+
+#
+# Samba
+#
+class _Samba:
+
+    def __init__(self, ares):
+        self._ares = ares
+        self._cfg  = '/files/etc/samba/smb.conf'
+
+    # Search a record
+    def _rec(self, name):
+        cfg = self._cfg
+        aug = self._ares.aug
+        for rec in aug.match(cfg + '/target'):
+            if aug.get(rec) == name:
+                return rec
+        raise ErosError('%s record not found' % (name))
+
+    def setup(self):
+
+        aug = self._ares.aug
+        cfg = self._cfg
+        rec = self._rec('global')
+
+        # TODO: fix augeas uncommenting
+        if not aug.match(rec + '/security'):
+            for key in aug.match(rec + '/#comment'):
+                if aug.get(key) == 'security = user':
+                    aug.insert(key, 'security', before=False)
+                    break
+
+        aug.set(rec + '/security', 'user')
+        aug.set(rec + '/passdb backend', 'ldapsam:ldap://localhost')
+        aug.set(rec + '/ldap suffix', 'dc=nodomain')
+        aug.set(rec + '/ldap user suffix', 'ou=People')
+        aug.set(rec + '/ldap group suffix', 'ou=Group')
+        aug.set(rec + '/ldap admin dn', 'cn=admin,dc=nodomain')
+
+        try:
+            rec = self._rec('data')
+        except:
+            rec = cfg + '/target[%d]' % (len(aug.match(cfg + '/target')) + 1)
+            aug.set(rec, 'data')
+
+        aug.set(rec + '/path', '/srv/data')
+        aug.set(rec + '/browseable', 'yes')
+        aug.set(rec + '/writeable', 'yes')
+        aug.set(rec + '/admin users', 'manager')
+        aug.set(rec + '/create mask', '0664')
+        aug.set(rec + '/directory mask', '0775')
+
+        data = '/srv/data'
+        if not os.path.exists(data):
+            os.mkdir(data)
+        os.chown(data, 0, grp.getgrnam('users')[2])
+        os.chmod(data,0775)
+        cmd = 'chmod g+s %s' % data
+        if os.system(cmd) != 0:
+            raise AresError('F: %s' % cmd)
+
+#
+# Postconfig
+#
+class _Postconfig:
+
+    def __init__(self, ares):
+        self._ares = ares
+
+    def setup(self):
+
+        # Stop here if we not running as root
+        aug = self._ares.aug
+        if aug.get('/augeas/root') == 'fakeroot/':
+            return
+
+        cmd = 'smbpasswd -w admin'
+        if os.system(cmd) != 0:
+            raise AresError('F: %s' % cmd)
+

ares/trunk/tests/TestAres.py

@@ -14 +14 @@
 
     def test_ldap(self):
-        ares = Ares(test=True)
+        ares = Ares(test=False)
         ares.ldap.setup()
         ares.squid.setup()
@@ -25 +25 @@
         ares.amavis.setup()
         ares.spamassassin.setup()
+        ares.samba.setup()
+        ares.fetchmail.setup()
         ares.aug.save()
+        ares.postconfig.setup()
 
 if __name__ == '__main__':