From d4de193b52881590c07468bdfece5f82fa48840d Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 30 Aug 2012 06:05:49 +0900
Subject: remove unused function

---
 src/leap/eip/config.py            | 95 ---------------------------------------
 src/leap/eip/openvpnconnection.py | 18 --------
 2 files changed, 113 deletions(-)

(limited to 'src')

diff --git a/src/leap/eip/config.py b/src/leap/eip/config.py
index 70108a1d..c0819628 100644
--- a/src/leap/eip/config.py
+++ b/src/leap/eip/config.py
@@ -19,23 +19,6 @@ logging.basicConfig()
 logger = logging.getLogger(name=__name__)
 logger.setLevel('DEBUG')
 
-# XXX deprecate per #447
-OPENVPN_CONFIG_TEMPLATE = """#Autogenerated by eip-client wizard
-remote {VPN_REMOTE_HOST} {VPN_REMOTE_PORT}
-
-client
-dev tun
-persist-tun
-persist-key
-proto udp
-tls-client
-remote-cert-tls server
-
-cert {LEAP_EIP_KEYS}
-key {LEAP_EIP_KEYS}
-ca {LEAP_EIP_KEYS}
-"""
-
 
 class EIPConfig(baseconfig.JSONLeapConfig):
     spec = eipspecs.eipconfig_spec
@@ -63,84 +46,6 @@ class EIPServiceConfig(baseconfig.JSONLeapConfig):
     slug = property(_get_slug, _set_slug)
 
 
-# XXX deprecate by #447
-def check_or_create_default_vpnconf(config):
-    """
-    checks that a vpn config file
-    exists for a default provider,
-    or creates one if it does not.
-    ATM REQURES A [provider] section in
-    eip.cfg with _at least_ a remote_ip value
-    """
-    default_provider_path = baseconfig.get_default_provider_path()
-
-    if not os.path.isdir(default_provider_path):
-        mkdir_p(default_provider_path)
-
-    conf_file = baseconfig.get_config_file(
-        'openvpn.conf',
-        folder=default_provider_path)
-
-    if os.path.isfile(conf_file):
-        return
-    else:
-        logger.debug(
-            'missing default openvpn config\n'
-            'creating one...')
-
-    # We're getting provider from eip.cfg
-    # by now. Get it from a list of gateways
-    # instead.
-
-    try:
-        # XXX by now, we're expecting
-        # only IP format for remote.
-        # We should allow also domain names,
-        # and make a reverse resolv.
-        remote_ip = config.get('provider',
-                               'remote_ip')
-        baseconfig.validate_ip(remote_ip)
-
-    except ConfigParser.NoSectionError:
-        raise eip_exceptions.EIPInitNoProviderError
-
-    except socket.error:
-        # this does not look like an ip, dave
-        raise eip_exceptions.EIPInitBadProviderError
-
-    if config.has_option('provider', 'remote_port'):
-        remote_port = config.get('provider',
-                                 'remote_port')
-    else:
-        remote_port = 1194
-
-    default_subpath = os.path.join("providers",
-                                   "default")
-    default_provider_path = baseconfig.get_config_file(
-        '',
-        folder=default_subpath)
-
-    if not os.path.isdir(default_provider_path):
-        mkdir_p(default_provider_path)
-
-    conf_file = baseconfig.get_config_file(
-        'openvpn.conf',
-        folder=default_provider_path)
-
-    # XXX keys have to be manually placed by now
-    keys_file = baseconfig.get_config_file(
-        'openvpn.keys',
-        folder=default_provider_path)
-
-    ovpn_config = OPENVPN_CONFIG_TEMPLATE.format(
-        VPN_REMOTE_HOST=remote_ip,
-        VPN_REMOTE_PORT=remote_port,
-        LEAP_EIP_KEYS=keys_file)
-
-    with open(conf_file, 'wb') as f:
-        f.write(ovpn_config)
-
-
 def build_ovpn_options(daemon=False):
     """
     build a list of options
diff --git a/src/leap/eip/openvpnconnection.py b/src/leap/eip/openvpnconnection.py
index 5f67d27a..1f2f6d8c 100644
--- a/src/leap/eip/openvpnconnection.py
+++ b/src/leap/eip/openvpnconnection.py
@@ -139,23 +139,6 @@ to be triggered for each one of them.
             self.command = command
             self.args = args
 
-    def _check_ovpn_config(self):
-        """
-        checks if there is a default openvpn config.
-        if not, it writes one with info from the provider
-        definition file
-        """
-        # TODO
-        # - get --with-openvpn-config from opts
-        try:
-            eip_config.check_or_create_default_vpnconf(self.config)
-        except eip_exceptions.EIPInitNoProviderError:
-            logger.error('missing default provider definition')
-            self.missing_provider = True
-        except eip_exceptions.EIPInitBadProviderError:
-            logger.error('bad provider definition')
-            self.bad_provider = True
-
     def _get_or_create_config(self):
         """
         retrieves the config options from defaults or
@@ -168,7 +151,6 @@ to be triggered for each one of them.
 
         self._set_autostart()
         self._set_ovpn_command()
-        self._check_ovpn_config()
 
     def _check_vpn_keys(self):
         """
-- 
cgit v1.2.3