Remove invalid TODO comment in proxy host subhandler (closes #8).

[software/pymin.git] / services / proxy / __init__.py

diff --git a/services/proxy/__init__.py b/services/proxy/__init__.py
index 7a5272476bf4f9a0a27fcc2910931b32af2f9cfc..33e18d6ef11fd4c8e972a531a7a1e1ca81c98706 100644 (file)
--- a/services/proxy/__init__.py
+++ b/services/proxy/__init__.py
@@ -1,108 +1,17 @@
 # vim: set encoding=utf-8 et sw=4 sts=4 :
 
-from os import path
-import logging ; log = logging.getLogger('pymin.services.proxy')
-
-from pymin.seqtools import Sequence
-from pymin.dispatcher import Handler, handler, HandlerError
-from pymin.service.util import Restorable, ConfigWriter, InitdHandler, \
-                               TransactionalHandler, ParametersHandler, \
-                               DictSubHandler
-
-import crypt
-
-
-__all__ = ('ProxyHandler', 'get_service')
-
+from formencode import validators as V
+from pymin.config import Option
+from handler import ProxyHandler
+
+def setup_service(options, config):
+    options.add_group('proxy', 'Proxy service', [
+        Option('pickle_dir', V.String, metavar='DIR',
+               help='store persistent data in DIR directory'),
+        Option('config_dir', V.String, metavar='DIR',
+               help='write config files in DIR directory'),
+    ])
 
 def get_service(config):
     return ProxyHandler(config.proxy.pickle_dir, config.proxy.config_dir)
 
-
-class Host(Sequence):
-    def __init__(self,ip):
-        self.ip = ip
-    def as_tuple(self):
-        return (self.ip,)
-
-# TODO convert to a SetSubHandler
-
-class HostHandler(DictSubHandler):
-
-    handler_help = u"Manage proxy hosts"
-
-    _cont_subhandler_attr = 'hosts'
-    _cont_subhandler_class = Host
-
-class User(Sequence):
-    def __init__(self, name, password):
-        self.name = name
-        self.password = crypt.crypt(password,'BA')
-    def as_tuple(self):
-        return (self.name, self.password)
-    def update(self, password=None):
-        if password is not None:
-            self.password = crypt.crypt(password,'BA')
-
-class UserHandler(DictSubHandler):
-
-    handler_help = u"Manage proxy users"
-
-    _cont_subhandler_attr = 'users'
-    _cont_subhandler_class = User
-
-class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
-                   TransactionalHandler, ParametersHandler):
-
-    handler_help = u"Manage proxy service"
-
-    _initd_name = 'squid'
-
-    _persistent_attrs = ('params', 'hosts', 'users')
-
-    _restorable_defaults = dict(
-            hosts = dict(),
-            params  = dict(
-                ip   = '192.168.0.1',
-                port = '8080',
-            ),
-            users = dict(),
-    )
-
-    _config_writer_files = ('squid.conf','users.conf')
-    _config_writer_tpl_dir = path.join(path.dirname(__file__), 'templates')
-
-    def __init__(self, pickle_dir='.', config_dir='.'):
-        r"Initialize DhcpHandler object, see class documentation for details."
-        log.debug(u'ProxyHandler(%r, %r)', pickle_dir, config_dir)
-        self._persistent_dir = pickle_dir
-        self._config_writer_cfg_dir = config_dir
-        self._config_build_templates()
-        InitdHandler.__init__(self)
-        self.host = HostHandler(self)
-        self.user = UserHandler(self)
-
-    def _get_config_vars(self, config_file):
-        if config_file == 'squid.conf':
-            return dict(hosts=self.hosts.values(), **self.params)
-        return dict(users=self.users)
-
-
-if __name__ == '__main__':
-
-    logging.basicConfig(
-        level   = logging.DEBUG,
-        format  = '%(asctime)s %(levelname)-8s %(message)s',
-        datefmt = '%H:%M:%S',
-    )
-
-    px = ProxyHandler()
-    px.set('ip','192.66.66.66')
-    px.set('port','666')
-    px.host.add('192.168.0.25.25')
-    px.host.add('192.168.0.25.26')
-    px.host.add('192.168.0.25.27')
-    px.host.delete('192.168.0.25.27')
-    px.user.add('lala','soronga')
-    px.user.add('culo','sarasa')
-    px.commit()