merge ^/branches/tk329

see #329

svn path=/trunk/; revision=4914

1 files changed, 1 insertions, 20 deletions

diff --git a/rpkid/rpki/gui/app/glue.py b/rpkid/rpki/gui/app/glue.py
index bf68170e..cad48147 100644
--- a/rpkid/rpki/gui/app/glue.py
+++ b/rpkid/rpki/gui/app/glue.py
@@ -30,7 +30,7 @@ from rpki.resource_set import (resource_set_as, resource_set_ipv4,
                                resource_range_ipv6)
 from rpki.left_right import list_received_resources_elt
 from rpki.irdb.zookeeper import Zookeeper
-from rpki.gui.app import models, settings
+from rpki.gui.app import models
 from rpki.exceptions import BadIPResource
 
 from django.contrib.auth.models import User
@@ -110,25 +110,6 @@ def list_received_resources(log, conf):
             print >>log, "error: unexpected pdu from rpkid type=%s" % type(pdu)
 
 
-def config_from_template(dest, a):
-    """
-    Create a new rpki.conf file from a generic template.  Go line by line
-    through the template and substitute directives from the dictionary 'a'.
-
-    """
-    with open(dest, 'w') as f:
-        for r in open(settings.RPKI_CONF_TEMPLATE):
-            words = r.split()
-            if words:
-                word = words[0].strip()
-                if word in a:
-                    print >>f, "%s\t\t\t\t= %s\n" % (word, a[word])
-                else:
-                    print >>f, r,
-            else:
-                print >>f, r,
-
-
 def str_to_resource_range(prefix):
     try:
         r = resource_range_ipv4.parse_str(prefix)