Make procman.ProcessManager.restart(p) update pidmap when p was running.

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index 91d8e2eb8d2c2ed72cccce32807c303098c25ff5..aae79c185fa02ae0783d5e5828de3d46bc29f95c 100644 (file)
--- a/config.py
+++ b/config.py
@@ -1,5 +1,13 @@
 # vim: set et sts=4 sw=4 encoding=utf-8 :
 
 # vim: set et sts=4 sw=4 encoding=utf-8 :
 

+# First of all, we need to setup the logging framework
+import logging
+logging.basicConfig(
+        level   = logging.DEBUG,
+        format  = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s',
+        datefmt = '%a, %d %b %Y %H:%M:%S',
+)
+

 from pymin.services import *
 from pymin.dispatcher import Handler
 from os.path import join
 from pymin.services import *
 from pymin.dispatcher import Handler
 from os.path import join


@@ -12,24 +20,27 @@ config_path = join(base_path, 'config')
 class Root(Handler):
 
     def __init__(self):
 class Root(Handler):
 
     def __init__(self):

-        f = file("/proc/sys/net/ipv4/ip_forward","w")
-        f.write("1")
-        f.close()
+        try:
+            f = file("/proc/sys/net/ipv4/ip_forward","w")
+            f.write("1")
+            f.close()
+        except (IOError, OSError), e:
+            print "Can't set ip_forward:", e

         #self.ip.device_up_hook(self.dns)
 
     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),
         #self.ip.device_up_hook(self.dns)
 
     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),

-        config_dir = '/tmp')
+        config_dir = join(config_path, 'firewall'))

 
     nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
 
     ppp = PppHandler(
         pickle_dir = join(pickle_path, 'ppp'),
         config_dir = {
 
     nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
 
     ppp = PppHandler(
         pickle_dir = join(pickle_path, 'ppp'),
         config_dir = {

-            'pap-secrets':  '/etc/ppp',
-            'chap-secrets': '/etc/ppp',
-            'options.X':    '/etc/ppp',
-            'nameX':        '/etc/ppp/peers',
+            'pap-secrets':  join(config_path, 'ppp'),
+            'chap-secrets': join(config_path, 'ppp'),
+            'options.X':    join(config_path, 'ppp'),
+            'nameX':        join(config_path, 'ppp', 'peers'),

         })
 
     vpn = VpnHandler(
         })
 
     vpn = VpnHandler(


@@ -43,30 +54,30 @@ class Root(Handler):
     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),
         config_dir = {
     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),
         config_dir = {

-            'named.conf': '/etc',
-            'zoneX.zone': '/var/lib/named',
+            'named.conf': join(config_path, 'dns'),
+            'zoneX.zone': join(config_path, 'dns', 'zones'),

         })
 
     dhcp = DhcpHandler(
         pickle_dir = join(pickle_path, 'dhcp'),
         })
 
     dhcp = DhcpHandler(
         pickle_dir = join(pickle_path, 'dhcp'),

-        config_dir = '/etc')
+        config_dir = join(config_path, 'dhcp'))

 
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
 
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),

-        config_dir = '/etc/squid')
+        config_dir = join(config_path, 'proxy'))

 
     vrrp = VrrpHandler(
         pickle_dir = join(pickle_path, 'vrrp'),
         config_dir = join(config_path, 'vrrp'),
 
     vrrp = VrrpHandler(
         pickle_dir = join(pickle_path, 'vrrp'),
         config_dir = join(config_path, 'vrrp'),

-        pid_dir    = '/var/run')
+        pid_dir    = join(config_path, 'vrrp', 'run'))

 
     vpn = VpnHandler(
         pickle_dir = join(pickle_path, 'vpn'),
 
     vpn = VpnHandler(
         pickle_dir = join(pickle_path, 'vpn'),

-        config_dir = '/etc/tinc')
+        config_dir = join(config_path, 'vpn'))

 
     #qos = QoSHandler(
 
     #qos = QoSHandler(

-        #pickle_dir = join(pickle_path, 'qos'),
-        #config_dir = join(config_path, 'qos'))
+    #    pickle_dir = join(pickle_path, 'qos'),
+    #    config_dir = join(config_path, 'qos'))

 
 bind_addr = \
 (
 
 bind_addr = \
 (