Remove ReturnNot0Error, use subprocess.check_call instead.

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index db3151b2f93a4125e33cacd519736e817a33a5a4..3ff98c687a8c2a99eb8e16cf7508beb49b698e84 100644 (file)
--- a/config.py
+++ b/config.py
@@ -13,19 +13,23 @@ class Root(Handler):
 
     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),
 
     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(
+         pickle_dir = join(pickle_path, 'vpn'),
+         config_dir = join(config_path, 'vpn'))
+

     ip = IpHandler(
         pickle_dir = join(pickle_path, 'ip'),
         config_dir = join(config_path, 'ip'))
     ip = IpHandler(
         pickle_dir = join(pickle_path, 'ip'),
         config_dir = join(config_path, 'ip'))


@@ -33,22 +37,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'),
+        config_dir = join(config_path, 'vpn'))
+
+    #qos = QoSHandler(
+    #    pickle_dir = join(pickle_path, 'qos'),
+    #    config_dir = join(config_path, 'qos'))

 
 bind_addr = \
 (
 
 bind_addr = \
 (