Changeset 797

Timestamp:

09/06/08 13:49:42 (3 months ago)

Author:

free

Message:

Added _Nfs class

Location:

ares/trunk

Files:

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

ares/trunk/ares.py

@@ -62 +62 @@
         self.fetchmail    = _Fetchmail(self)
         self.samba        = _Samba(self)
+        self.nfs          = _Nfs(self)
         self.postconfig   = _Postconfig(self)
 
@@ -499 +500 @@
         aug.set(rec + '/directory mask', '0775')
 
+        # Stop here if we not running as root
+        aug = self._ares.aug
+        if aug.get('/augeas/root') == 'fakeroot/':
+            return
+
         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)
+
+#
+# Nfs
+#
+class _Nfs:
+
+    def __init__(self, ares):
+        self._ares = ares
+        self._cfg  = '/files/etc/exports'
+
+    def setup(self):
+
+        aug = self._ares.aug
+        cfg = self._cfg
+
+        dirs = [ aug.get(key) for key in aug.match(cfg + '/dir') ]
+        for dir in [ '/home', '/srv/data' ]:
+            if dir not in dirs:
+                key = cfg + '/dir[%d]' % (len(dirs)+1)
+                aug.set(key, dir)
+                aug.set(key + '/client', '*')
+                aug.set(key + '/client/option[1]', 'rw')
+                aug.set(key + '/client/option[2]', 'sync')
+                aug.set(key + '/client/option[3]', 'no_root_squash')
 
 #

ares/trunk/tests/TestAres.py

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