chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make-secnet-sites: Actually include addresses in sites.conf
[secnet.git]
/
make-secnet-sites
diff --git
a/make-secnet-sites
b/make-secnet-sites
index 547f5724652988189abd03ae46ff93fb2b28339b..dc6ec78dd5ac5bcbb446e79ddecbbf5ef9d05d53 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':(lambda n,v:"address %s;\n"%v),
'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"
@@
-375,6
+376,8
@@
def pline(i,allow_include=False):
if nl.depth<allow_defs:
complain("New definitions not allowed at "
"level %d"%nl.depth)
if nl.depth<allow_defs:
complain("New definitions not allowed at "
"level %d"%nl.depth)
+ # we risk crashing if we continue
+ sys.exit(1)
current.children[w[1]]=nl
current=nl
obstack.append(current)
current.children[w[1]]=nl
current=nl
obstack.append(current)
@@
-391,8
+394,10
@@
def pline(i,allow_include=False):
def pfilepath(pathname,allow_include=False):
f=open(pathname)
def pfilepath(pathname,allow_include=False):
f=open(pathname)
- pfile(pathname,f.readlines(),allow_include=allow_include)
+ lines=f.readlines()
+ pfile(pathname,lines,allow_include=allow_include)
f.close()
f.close()
+ return lines
def pfile(name,lines,allow_include=False):
"Process a file"
def pfile(name,lines,allow_include=False):
"Process a file"
@@
-413,20
+418,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
@@
-465,10
+471,13
@@
else:
if not ok:
print "caller not in group %s"%group
sys.exit(1)
if not ok:
print "caller not in group %s"%group
sys.exit(1)
- pfilepath(header,allow_include=True)
+
headerinput=
pfilepath(header,allow_include=True)
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)