diff options
| author | Rob Austein <sra@hactrn.net> | 2010-03-17 21:01:46 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-03-17 21:01:46 +0000 |
| commit | bc6d52514066e10258b389f5f7d05822469d8468 (patch) | |
| tree | 043e533bd0169eb8ec53df7fa4287e6936f2c3b0 /myrpki | |
| parent | 91c5f8e90c33c41b58ff08aab639904913244e84 (diff) | |
Old test code wasn't setting server hostnames in config files.
svn path=/myrpki/myirbe.py; revision=3121
Diffstat (limited to 'myrpki')
| -rw-r--r-- | myrpki/myirbe.py | 1 | ||||
| -rw-r--r-- | myrpki/yamltest.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/myrpki/myirbe.py b/myrpki/myirbe.py index 3bb001bd..c2c92279 100644 --- a/myrpki/myirbe.py +++ b/myrpki/myirbe.py @@ -78,6 +78,7 @@ repository_handle = "repository" os.environ["TZ"] = "UTC" time.tzset() +rpki.log.use_syslog = False rpki.log.init("myirbe") cfg_file = "myrpki.conf" diff --git a/myrpki/yamltest.py b/myrpki/yamltest.py index 6c4f83da..c7743661 100644 --- a/myrpki/yamltest.py +++ b/myrpki/yamltest.py @@ -390,6 +390,7 @@ class allocation(object): r["myirbe", "irdbd_conf"] = "myrpki.conf" r["myirbe", "rpkid_base"] = "https://localhost:%d/" % self.rpkid_port r["rpkid", "irdb-url"] = "https://localhost:%d/" % self.irdbd_port + r["rpkid", "server-host"] = "localhost" r["rpkid", "server-port"] = "%d" % self.rpkid_port r["rpkid", "sql-database"] = "rpki%d" % self.engine r["myirbe", "want_pubd"] = "true" if self.runs_pubd() else "false" @@ -408,6 +409,7 @@ class allocation(object): r["rootd", "root_cert_manifest"] = r["rootd", "rpki-base-uri"] + r["rootd", "rpki-root-manifest"] if self.runs_pubd(): + r["pubd", "server-host"] = "localhost" r["pubd", "server-port"] = "%d" % self.pubd_port r["pubd", "sql-database"] = "pubd%d" % self.engine r["irbe_cli", "pubd-url"] = "https://localhost:%d/control/" % self.pubd_port |