Changeset 811

Timestamp:

09/08/08 21:29:07 (2 months ago)

Author:

free

Message:

Added webmin and postifx classes

Location:

ares/trunk

Files:

• ares.py (modified) (2 diffs)
• debian/dirs (added)
• debian/postinst (modified) (2 diffs)
• tests/TestAres.py (modified) (1 diff)

ares/trunk/ares.py

@@ -69 +69 @@
         self.apt          = _Apt(self)
         self.sshd         = _Sshd(self)
+        self.postfix      = _Postfix(self)
+        self.webmin       = _Webmin(self)
         self.postconfig   = _Postconfig(self)
 
@@ -622 +624 @@
 
 #
+# Postfix
+#
+class _Postfix:
+
+    def __init__(self, ares):
+        self._ares = ares
+        self._cfg = '/files/etc/postfix/main.cf'
+
+    def setup(self):
+        cfg = self._cfg
+        aug = self._ares.aug
+
+        aug.set(cfg + '/home_mailbox', 'Maildir/')
+        aug.set(cfg + '/content_filter', 'smtp-amavis:[127.0.0.1]:10024')
+
+#
+# Webmin
+#
+class _Webmin:
+
+    def __init__(self, ares):
+        self._ares = ares
+        self._cfg = '/files/etc/webmin/miniserv.conf'
+
+    def setup(self):
+        cfg = self._cfg
+        aug = self._ares.aug
+
+        aug.set(cfg + '/ssl', '1')
+
+        cfg =  '/files/etc/webmin/ldap-useradmin/config'
+        aug.set(cfg + '/auth_ldap', '/etc/ldap.conf')
+        aug.set(cfg + '/shells',        'fixed,passwd,shells')
+        aug.set(cfg + '/samba_def',     '1')   
+        aug.set(cfg + '/samba_gclass',  'sambaGroupMapping')
+        aug.set(cfg + '/other_class',   'inetOrgPerson')
+        aug.set(cfg + '/ldap_tls',      '0')        
+        aug.set(cfg + '/login',         'cn=admin,dc=nodomain')
+        aug.set(cfg + '/user_base',     'ou=People,dc=nodomain') 
+        aug.set(cfg + '/group_base',    'ou=Group,dc=nodomain')
+        aug.set(cfg + '/props',         'sn:Cognome')
+        aug.set(cfg + '/default_shell', '/bin/bash')          
+        aug.set(cfg + '/pass',          'admin')            
+        aug.set(cfg + '/samba_domain',  'S-1-0-0')
+
+#
 # Postconfig
 #

ares/trunk/debian/postinst

@@ -25 +25 @@
      done
 
-     cdd-config ldap server
-     cdd-config ldap client
-
+     # TODO
      db_get ares/manager-password
      password="$RET"
@@ -42 +40 @@
      db_get arno-iptables-firewall/config-int-net
      net="$RET"
-     cdd-config squid $net
 
-     db_get postfix/mailname
-     hostname="$RET"
-     cdd-config fqdn $hostname
-
-     db_get postfix/root_address
-     root="$RET"
+     # TODO set root alias and custom master.cf
      cdd-config postfix $root
-
-     cdd-config dnsmasq $(echo $net |cut -f 1-3 -d .)
-     cdd-config hosts $(echo $net |cut -f 1-3 -d .).1 $hostname ares
-     cdd-config monit
-     cdd-config ssl
-     cdd-config squirrelmail $hostname
-     cdd-config amavis $hostname
-
-     cdd-config spamassassin
-     cdd-config fetchmail 30
-     cdd-config samba
-     cdd-config webmin
-     cdd-config nfs server
-     cdd-config havp
-     cdd-config klogd
-     cdd-config apt ares hardy
-     cdd-config sshd /usr/share/ares/authorized_keys
+     
+     # TODO create a proper lens for webmin
 
     ;;

ares/trunk/tests/TestAres.py

@@ -16 +16 @@
         ares = Ares(test=True)
         ares.ldap.setup()
+        ares.hostname.setup()
+        ares.hosts.setup()
+        ares.dnsmasq.setup()
+        ares.monit.setup()
         ares.squid.setup()
-        ares.hostname.setup()
-        ares.dnsmasq.setup()
-        ares.hosts.setup()
-        ares.monit.setup()
+        ares.amavis.setup()
+        ares.spamassassin.setup()
+        ares.postfix.setup()
         ares.ssl.setup()
         ares.squirrel.setup()
-        ares.amavis.setup()
-        ares.spamassassin.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()