aboutsummaryrefslogtreecommitdiff
path: root/rpkid/portal-gui
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2013-04-05 19:10:24 +0000
committerRob Austein <sra@hactrn.net>2013-04-05 19:10:24 +0000
commitf25b1a9a55fd9e61b19d073fe8426cc2aac3c0ef (patch)
tree4495dac631992d4fe843a42b15b833ec6fb9d12b /rpkid/portal-gui
parent0b3938408e8340af9487a02c144661f60ea94931 (diff)
Whack build environment with a club to get rpki-ca package to start up
properly after install on Ubuntu. Some cleanup still required, rpki-ca cron stuff isn't done yet, and GUI has not yet been tested with this, but daemons now start up properly upon install as an Ubuntu user would expect, which is some kind of progress. svn path=/trunk/; revision=5283
Diffstat (limited to 'rpkid/portal-gui')
-rw-r--r--rpkid/portal-gui/scripts/rpki-manage.py4
-rw-r--r--rpkid/portal-gui/scripts/rpkigui-check-expired.py2
-rw-r--r--rpkid/portal-gui/scripts/rpkigui-import-routes.py2
-rw-r--r--rpkid/portal-gui/scripts/rpkigui-rcynic.py2
4 files changed, 8 insertions, 2 deletions
diff --git a/rpkid/portal-gui/scripts/rpki-manage.py b/rpkid/portal-gui/scripts/rpki-manage.py
index 7bf84709..0d581ce9 100644
--- a/rpkid/portal-gui/scripts/rpki-manage.py
+++ b/rpkid/portal-gui/scripts/rpki-manage.py
@@ -4,8 +4,8 @@ import os
from django.core.management import execute_from_command_line
# django-admin seems to have problems creating the superuser account when
-# $LANG is unset
-if not 'LANG' in os.environ:
+# $LANG is unset or is set to something totally incompatible with UTF-8.
+if os.environ.get('LANG') in (None, "", "C"):
os.environ['LANG'] = 'en_US.UTF-8'
os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.default_settings'
diff --git a/rpkid/portal-gui/scripts/rpkigui-check-expired.py b/rpkid/portal-gui/scripts/rpkigui-check-expired.py
index 90c492ff..eb0c7fbb 100644
--- a/rpkid/portal-gui/scripts/rpkigui-check-expired.py
+++ b/rpkid/portal-gui/scripts/rpkigui-check-expired.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
# Copyright (C) 2012 SPARTA, Inc. a Parsons Company
#
# Permission to use, copy, modify, and distribute this software for any
diff --git a/rpkid/portal-gui/scripts/rpkigui-import-routes.py b/rpkid/portal-gui/scripts/rpkigui-import-routes.py
index 776a16e2..fa3ff3e9 100644
--- a/rpkid/portal-gui/scripts/rpkigui-import-routes.py
+++ b/rpkid/portal-gui/scripts/rpkigui-import-routes.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
# Copyright (C) 2012, 2013 SPARTA, Inc. a Parsons Company
#
# Permission to use, copy, modify, and distribute this software for any
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
index 4f18c5bb..c8f1b994 100644
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
# Copyright (C) 2011 SPARTA, Inc. dba Cobham
# Copyright (C) 2012, 2013 SPARTA, Inc. a Parsons Company
#