make-secnet-sites: New -P <prefix> option

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index 5911a398eb9e581c3de2eaa06d5e4a45e74efd68..c49467a19f687c5f1fb78dfb15ebe44a5790c9ae 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -267,12 +267,12 @@ class sitelevel(level):
         'networks':None,
         'peer':None,
         'pubkey':(lambda n,v:"key %s;\n"%v),
         'networks':None,
         'peer':None,
         'pubkey':(lambda n,v:"key %s;\n"%v),

+        'address':None,

         'mobile':sp,
        })
        require_properties={
         'dh':"Diffie-Hellman group",
         'contact':"Site admin contact address",
         'mobile':sp,
        })
        require_properties={
         'dh':"Diffie-Hellman group",
         'contact':"Site admin contact address",

-        'address':"Site external access address",

         'networks':"Networks claimed by the site",
         'hash':"hash function",
         'peer':"Gateway address of the site",
         'networks':"Networks claimed by the site",
         'hash':"hash function",
         'peer':"Gateway address of the site",


@@ -320,6 +320,7 @@ def moan(msg):
 root=level(['root','root'])   # All vpns are children of this node
 obstack=[root]
 allow_defs=0   # Level above which new definitions are permitted
 root=level(['root','root'])   # All vpns are children of this node
 obstack=[root]
 allow_defs=0   # Level above which new definitions are permitted

+prefix=''

 
 def set_property(obj,w):
        "Set a property on a configuration node"
 
 def set_property(obj,w):
        "Set a property on a configuration node"


@@ -415,20 +416,21 @@ def outputsites(w):
        w.write("# Command line: %s\n\n"%string.join(sys.argv))
 
        # Raw VPN data section of file
        w.write("# Command line: %s\n\n"%string.join(sys.argv))
 
        # Raw VPN data section of file

-       w.write("vpn-data {\n")
+       w.write(prefix+"vpn-data {\n")

        for i in root.children.values():
                i.output_data(w,2,"")
        w.write("};\n")
 
        # Per-VPN flattened lists
        for i in root.children.values():
                i.output_data(w,2,"")
        w.write("};\n")
 
        # Per-VPN flattened lists

-       w.write("vpn {\n")
+       w.write(prefix+"vpn {\n")

        for i in root.children.values():
        for i in root.children.values():

-               i.output_vpnflat(w,2,"vpn-data")
+               i.output_vpnflat(w,2,prefix+"vpn-data")

        w.write("};\n")
 
        # Flattened list of sites
        w.write("};\n")
 
        # Flattened list of sites

-       w.write("all-sites %s;\n"%string.join(map(lambda x:"vpn/%s/all-sites"%
-               x,root.children.keys()),","))
+       w.write(prefix+"all-sites %s;\n"%string.join(
+               map(lambda x:"%svpn/%s/all-sites"%(prefix,x),
+                       root.children.keys()),","))

 
 # Are we being invoked from userv?
 service=0
 
 # Are we being invoked from userv?
 service=0


@@ -471,6 +473,9 @@ else:
                userinput=sys.stdin.readlines()
                pfile("user input",userinput)
        else:
                userinput=sys.stdin.readlines()
                pfile("user input",userinput)
        else:

+               if sys.argv[1]=='-P':
+                       prefix=sys.argv[2]
+                       sys.argv[1:3]=[]

                if len(sys.argv)>3:
                        print "Too many arguments"
                        sys.exit(1)
                if len(sys.argv)>3:
                        print "Too many arguments"
                        sys.exit(1)