diff options
| author | Michael Elkins <melkins@tislabs.com> | 2011-01-24 22:59:42 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2011-01-24 22:59:42 +0000 |
| commit | eada6d6b96a9dbe6538eabf338d5b6425c4a8704 (patch) | |
| tree | 89c0209f951c672bbffbc683d789db28facea63c | |
| parent | 497515bec9064e7d45275d6b4cbc1d442ef4a037 (diff) | |
really fix glue.conf() *ahem*
svn path=/rpkid/rpki/gui/app/glue.py; revision=3652
| -rw-r--r-- | rpkid/rpki/gui/app/glue.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/gui/app/models.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rpkid/rpki/gui/app/glue.py b/rpkid/rpki/gui/app/glue.py index 25a06c1d..4e364e1a 100644 --- a/rpkid/rpki/gui/app/glue.py +++ b/rpkid/rpki/gui/app/glue.py @@ -55,7 +55,7 @@ def invoke_rpki(handle, args): myrpki_dir = conf(handle) config = myrpki_dir + '/rpki.conf' # default rpki.conf uses relative paths, so chdir() to the repo first - cmd = 'cd %s && %s %s' % (settings.MYRPKI, myrpki_dir, ' '.join(['--config=' + config] + args)) + cmd = 'cd %s && %s %s' % (myrpki_dir, settings.MYRPKI, ' '.join(['--config=' + config] + args)) print >>sys.stderr, 'invoking', cmd os.system(cmd) diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py index 0efcd5ba..ca26c91c 100644 --- a/rpkid/rpki/gui/app/models.py +++ b/rpkid/rpki/gui/app/models.py @@ -107,7 +107,6 @@ class RoaRequest(models.Model): else: return rpki.resource_set.roa_prefix_ipv6(r.min, r.prefixlen(), self.max_length) - class Asn(models.Model): '''An ASN or range thereof.''' lo = models.IntegerField(blank=False) @@ -204,4 +203,7 @@ class Roa(models.Model): def __unicode__(self): return u"%s's ROA for %d" % (self.conf, self.asn) + def get_absolute_url(self): + return ('rpki.gui.app.views.dashboard', '/roa/' + [str(self.pk)]) + # vim:sw=4 ts=8 expandtab |