diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-11-10 06:23:09 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-11-10 06:23:09 +0000 |
| commit | 2de91e8b2a3c663dd7a5f995331cc7ad7f33412f (patch) | |
| tree | 59f775fa08671588688bcafbc231a560dbaafcc3 | |
| parent | 105a935f9785c7a498695f2fdb040abea248b195 (diff) | |
| parent | 337f6796e1b6b58eb4ea92eaab11506ad2366ed9 (diff) | |
merge with ^/trunk
svn path=/branches/tk316/; revision=4836
| -rw-r--r-- | rpkid/Makefile.in | 10 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpki-manage.in | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index bd004f28..93c3582e 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -7,6 +7,7 @@ PYTHON = @PYTHON@ SECRET_KEY = @SECRET_KEY@ DJANGO_DIR = @DJANGO_DIR@ VIRTUAL_ENV = @VIRTUAL_ENV@ +DJANGO_ADMIN = @DJANGO_ADMIN@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ @POW_LDFLAGS@ @@ -46,7 +47,8 @@ SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd \ pubd rootd rpkic rpkid \ portal-gui/scripts/rpkigui-rcynic \ portal-gui/scripts/rpkigui-import-routes \ - portal-gui/scripts/rpkigui-check-expired + portal-gui/scripts/rpkigui-check-expired \ + portal-gui/scripts/rpki-manage # scripts we build, but don't install BUILD_SCRIPTS = portal-gui/scripts/rpkigui-reset-demo @@ -253,3 +255,9 @@ portal-gui/settings.py: ${srcdir}/portal-gui/settings.py.in rpki/gui/app/settings.py: ${srcdir}/rpki/gui/app/settings.py.in ${COMPILE_SETTINGS} + +portal-gui/scripts/rpki-manage: ${srcdir}/portal-gui/scripts/rpki-manage.in + sed -e "s|@DJANGO""_ADMIN@|${DJANGO_ADMIN}|" \ + -e "s|@PYTHON""PATH@|${sysconfdir}/rpki|" \ + ${srcdir}/portal-gui/scripts/rpki-manage.in > portal-gui/scripts/rpki-manage + chmod 755 $@ diff --git a/rpkid/portal-gui/scripts/rpki-manage.in b/rpkid/portal-gui/scripts/rpki-manage.in new file mode 100644 index 00000000..843ecc5b --- /dev/null +++ b/rpkid/portal-gui/scripts/rpki-manage.in @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +export PYTHONPATH=@PYTHONPATH@${PYTHONPATH:+:}${PYTHONPATH} DJANGO_SETTINGS_MODULE=settings +@DJANGO_ADMIN@ $* |