Changeset 813

Timestamp:

09/09/08 10:01:05 (3 months ago)

Author:

free

Message:

Added Makefile

Location:

ares/trunk

Files:

• Makefile (added)
• ares.py (modified) (3 diffs)
• debian/dirs (modified) (1 diff)
• debian/install (modified) (1 diff)
• monit (deleted)
• monitrc (copied) (copied from ares/trunk/monit/ares)
• rdiff-backup-wrapper (added)
• tests/TestAres.py (modified) (1 diff)
• tests/fakeroot/etc/dnsmasq.d (added)
• tests/fakeroot/etc/udev (added)
• tests/fakeroot/etc/udev/rules.d (added)

ares/trunk/ares.py

@@ -39 +39 @@
         if test:
             self.root  ='fakeroot/'
-            self.net   = '192.168.1.0/24'
-            self.fqdn  = 'ares.q1'
         else:
             self.root  = '/'
-            # TODO: find a way to configure these
-            self.net   = '192.168.2.0/24'
-            self.fqdn  = 'ares.q1'
         self.aug   = augeas.Augeas(root=self.root)
+
+        # TODO: find a way to configure these
+        self.device='/dev/backup'
+        self.vendor='WDC WD50'
+        self.model='00AAVS-00ZTB0   '
+        self.email='free.ekanayaka@gmail.com'
+        self.net   = '192.168.2.0/24'
+        self.fqdn  = 'ares.q1'
 
         # Common parameters
@@ -295 +298 @@
         aug.set(cfg + '/conf-dir', '/etc/dnsmasq.d')
 
-        if not os.path.exists(self._ares.root + 'etc/dnsmasq.d'):
-            os.mkdir(self._ares.root + 'etc/dnsmasq.d')
         net='.'.join(self._ares.net.split('.')[0:3])
         cfg = open(self._ares.root + 'etc/dnsmasq.d/ares.conf', 'w+')
@@ -679 +680 @@
 
     def setup(self):
-        device='/dev/backup'
-        vendor='WDC WD50'
-        model='00AAVS-00ZTB0   '
-
-#     cfg=/etc/cron.daily/backup
-#     cat <<EOF > $cfg
-# #!/bin/sh -e
-
-# rdiff-backup-wrapper $device /backup/local
-# EOF
-#     chmod 755 $cfg
-        cfg='/etc/udev/rules.d/80-backup.rules'
-#        run='/usr/bin/rdiff-backup-wrapper /dev/backup /backup/removable'
-        run='/usr/bin/rdiff-backup-wrapper /dev/backup /backup/removable free.ekanayaka@gmail.com'
+
+        device = self._ares.device
+        vendor = self._ares.vendor
+        model  = self._ares.model
+        email  = self._ares.email
+
+        cfg    = self._ares.root + 'etc/udev/rules.d/80-backup.rules'
+        run    = '/usr/sbin/rdiff-backup-wrapper %s /mnt %s' % (device, email)
+
         f = open(cfg, 'w+')
         f.write('BUS=="scsi", ATTRS{vendor}=="%s", ATTRS{model}=="%s", NAME="%%k", SYMLINK="backup"\n' % (vendor,model))

ares/trunk/debian/dirs

@@ -2 +2 @@
 srv/nfs/home
 srv/nfs/share
+etc/dnsmasq.d
+etc/udev/rules.d

ares/trunk/debian/install

@@ -1 @@
-ares-config     usr/sbin
-monit           etc/
-authorized_keys root/.ssh/

ares/trunk/tests/TestAres.py

@@ -15 +15 @@
     def test_ldap(self):
         ares = Ares(test=True)
-        ares.ldap.setup()
-        ares.hostname.setup()
-        ares.hosts.setup()
-        ares.dnsmasq.setup()
-        ares.monit.setup()
-        ares.squid.setup()
-        ares.amavis.setup()
-        ares.spamassassin.setup()
-        ares.postfix.setup()
-        ares.ssl.setup()
-        ares.squirrel.setup()
-        ares.fetchmail.setup()
-        ares.samba.setup()
-        ares.webmin.setup()
-        ares.nfs.setup()
-        ares.havp.setup()
-        ares.apt.setup()
-        ares.sshd.setup()
-        ares.nfs.setup()
-        ares.aug.save()
-        ares.postconfig.setup()
+#         ares.ldap.setup()
+#         ares.hostname.setup()
+#         ares.hosts.setup()
+#         ares.dnsmasq.setup()
+#         ares.monit.setup()
+#         ares.squid.setup()
+#         ares.amavis.setup()
+#         ares.spamassassin.setup()
+#         ares.postfix.setup()
+#         ares.ssl.setup()
+#         ares.squirrel.setup()
+#         ares.fetchmail.setup()
+#         ares.samba.setup()
+#         ares.webmin.setup()
+#         ares.nfs.setup()
+#         ares.havp.setup()
+#         ares.apt.setup()
+#         ares.sshd.setup()
+#         ares.nfs.setup()
+#         ares.aug.save()
+#         ares.postconfig.setup()
+        ares.backup.setup()
 
 if __name__ == '__main__':