diff options
| author | Rob Austein <sra@hactrn.net> | 2011-01-20 19:59:13 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-01-20 19:59:13 +0000 |
| commit | 7c26e04d89406d7af06d2ad2c951d9d50a797cf0 (patch) | |
| tree | 95bbb84e3e392043930864c3c8bbfa595b2236a7 /rpkid/tests/yamltest.py | |
| parent | 257406947dddcad49f9750977b8468fbf68b92f6 (diff) | |
Generate Python executables during compilation rather than from
./configure. Change (almost) all programs to use rpki.conf instead of
separate config files for each program, and add support for
${prefix}/etc/rpki.conf like normal system programs.
svn path=/buildtools/make-python-executable.py; revision=3620
Diffstat (limited to 'rpkid/tests/yamltest.py')
| -rw-r--r-- | rpkid/tests/yamltest.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py index 8e140746..ecd00af2 100644 --- a/rpkid/tests/yamltest.py +++ b/rpkid/tests/yamltest.py @@ -425,7 +425,7 @@ class allocation(object): print "Writing", f.name section = None - for line in open(cleanpath(rpkid_dir, "examples/myrpki.conf")): + for line in open(cleanpath(rpkid_dir, "examples/rpki.conf")): m = section_regexp.match(line) if m: section = m.group(1) @@ -486,7 +486,7 @@ class allocation(object): representing the running daemon. """ basename = os.path.basename(prog) - p = subprocess.Popen((sys.executable, prog, "-d", "-c", self.path("myrpki.conf")), + p = subprocess.Popen((sys.executable, prog, "-d", "-c", self.path("rpki.conf")), cwd = self.path(), stdout = open(self.path(os.path.splitext(basename)[0] + ".log"), "w"), stderr = subprocess.STDOUT) @@ -541,7 +541,7 @@ class allocation(object): os.environ["TZ"] = "UTC" time.tzset() -cfg_file = "yamltest.conf" +cfg_file = None pidfile = None keep_going = False @@ -613,7 +613,7 @@ try: d.dump_asns("asns.csv") d.dump_prefixes("prefixes.csv") d.dump_roas("roas.csv") - d.dump_conf("myrpki.conf") + d.dump_conf("rpki.conf") d.dump_rsyncd("rsyncd.conf") if False: d.dump_children("children.csv") @@ -640,7 +640,7 @@ try: "-signkey", "bpki/servers/ca.key", "-in", "bpki/servers/ca.req", "-out", "publication/root.cer", - "-extfile", "myrpki.conf", + "-extfile", "rpki.conf", "-extensions", "rootd_x509_extensions") |