diff options
| -rw-r--r-- | rpkid/Makefile.in | 12 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpkigui-check-expired.py | 5 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpkigui-flatten-roas.py | 3 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpkigui-import-routes.py | 5 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpkigui-rcynic.py | 3 |
5 files changed, 22 insertions, 6 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 88c9acf5..df7804fa 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -76,10 +76,10 @@ BUILD_SCRIPTS = portal-gui/scripts/rpkigui-reset-demo \ DATA_FILES = portal-gui/routeviews.sh # these files get put in ${sysconfdir}/rpki -CONF_FILES = portal-gui/apache.conf ${SETTINGS} +CONF_FILES = portal-gui/apache.conf portal-gui/default_settings.py ${SETTINGS} # automatically generated config files -SETTINGS=portal-gui/settings.py portal-gui/default_settings.py +SETTINGS=portal-gui/settings.py all:: ${POW_SO} rpki/relaxng.py myrpki.rng rpki/sql_schemas.py ${SCRIPTS} ${AUX_SCRIPTS} ${SETTINGS} ${BUILD_SCRIPTS} @@ -278,19 +278,19 @@ rpkid: rpkid.py ${COMPILE_PYTHON} portal-gui/scripts/rpkigui-rcynic: portal-gui/scripts/rpkigui-rcynic.py - ${COMPILE_DJANGO} + ${COMPILE_PYTHON} portal-gui/scripts/rpkigui-import-routes: portal-gui/scripts/rpkigui-import-routes.py - ${COMPILE_DJANGO} + ${COMPILE_PYTHON} portal-gui/scripts/rpkigui-reset-demo: portal-gui/scripts/rpkigui-reset-demo.py ${COMPILE_DJANGO} portal-gui/scripts/rpkigui-check-expired: portal-gui/scripts/rpkigui-check-expired.py - ${COMPILE_DJANGO} + ${COMPILE_PYTHON} portal-gui/scripts/rpkigui-flatten-roas: portal-gui/scripts/rpkigui-flatten-roas.py - ${COMPILE_DJANGO} + ${COMPILE_PYTHON} portal-gui/scripts/rpkigui-sync-users: portal-gui/scripts/rpkigui-sync-users.py ${COMPILE_DJANGO} diff --git a/rpkid/portal-gui/scripts/rpkigui-check-expired.py b/rpkid/portal-gui/scripts/rpkigui-check-expired.py index 68055fd0..90c492ff 100644 --- a/rpkid/portal-gui/scripts/rpkigui-check-expired.py +++ b/rpkid/portal-gui/scripts/rpkigui-check-expired.py @@ -16,6 +16,11 @@ __version__ = '$Id$' from optparse import OptionParser import logging +import sys + +# configure django ORM +from rpki.gui.script_util import setup +setup() from rpki.gui.app.check_expired import notify_expired diff --git a/rpkid/portal-gui/scripts/rpkigui-flatten-roas.py b/rpkid/portal-gui/scripts/rpkigui-flatten-roas.py index e94484cf..e21c368b 100644 --- a/rpkid/portal-gui/scripts/rpkigui-flatten-roas.py +++ b/rpkid/portal-gui/scripts/rpkigui-flatten-roas.py @@ -1,3 +1,6 @@ +from rpki.gui.script_util import setup +setup() + from django.db import transaction from django.db.models import Count from rpki.gui.app.models import ROARequest diff --git a/rpkid/portal-gui/scripts/rpkigui-import-routes.py b/rpkid/portal-gui/scripts/rpkigui-import-routes.py index 283c803b..fa8c16de 100644 --- a/rpkid/portal-gui/scripts/rpkigui-import-routes.py +++ b/rpkid/portal-gui/scripts/rpkigui-import-routes.py @@ -16,6 +16,11 @@ __version__ = '$Id$' import optparse import logging + +# configure django ORM +from rpki.gui.script_util import setup +setup() + from rpki.gui.routeview.util import import_routeviews_dump diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py index f133292f..ca251076 100644 --- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py +++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py @@ -21,6 +21,9 @@ default_root = '/var/rcynic/data' import logging +from rpki.gui.script_util import setup +setup() + from rpki.gui.cacheview.util import import_rcynic_xml if __name__ == '__main__': |