diff options
| author | Michael Elkins <melkins@tislabs.com> | 2011-12-19 19:20:24 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2011-12-19 19:20:24 +0000 |
| commit | 5c9c94c67135f09aecc619887a1184b1319c6681 (patch) | |
| tree | ce37ba4b46c74934c93461c76946043d2d26d6f2 | |
| parent | eaae1651c3010f318541c5e164d8b0bfde2419fd (diff) | |
remove sql setup script for the web portal since it is no longer needed; the gui and irdbd will share the same database, and the irdbd database is setup by $top/rpkid/rpki-sql-setup.py
svn path=/branches/tk139/; revision=4128
| -rw-r--r-- | rpkid/Makefile.in | 5 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpkigui-setup-sql.py | 29 |
2 files changed, 1 insertions, 33 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 33e0dde5..36016fef 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -44,7 +44,7 @@ POW_SO = rpki/POW/_POW.so SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd myrpki \ pubd rootd rpkid portal-gui/scripts/rpkigui-load-csv \ portal-gui/scripts/rpkigui-add-user portal-gui/scripts/rpkigui-response \ - portal-gui/scripts/rpkigui-rcynic portal-gui/scripts/rpkigui-setup-sql + portal-gui/scripts/rpkigui-rcynic AUX_SCRIPTS = @@ -247,9 +247,6 @@ portal-gui/scripts/rpkigui-rcynic: portal-gui/scripts/rpkigui-rcynic.py portal-gui/scripts/rpkigui-response: portal-gui/scripts/rpkigui-response.py ${COMPILE_DJANGO} -portal-gui/scripts/rpkigui-setup-sql: portal-gui/scripts/rpkigui-setup-sql.py - ${COMPILE_DJANGO} - portal-gui/apache/rpki.wsgi: ${srcdir}/portal-gui/apache/rpki.wsgi.in ${COMPILE_DJANGO} diff --git a/rpkid/portal-gui/scripts/rpkigui-setup-sql.py b/rpkid/portal-gui/scripts/rpkigui-setup-sql.py deleted file mode 100644 index 2d3c1833..00000000 --- a/rpkid/portal-gui/scripts/rpkigui-setup-sql.py +++ /dev/null @@ -1,29 +0,0 @@ -# $Id$ -# -# This script is responsible for creating the database used by the -# portal gui. Look in the settings.py file for the user and password. -# n.b. The configure script generates a random password. -# - -import getpass, MySQLdb -from django.conf import settings - -dbname = settings.DATABASES['default']['NAME'] -dbuser = settings.DATABASES['default']['USER'] -dbpass = settings.DATABASES['default']['PASSWORD'] - -print """WARNING!!! -WARNING!!! -WARNING!!! - -About to destroy and recreate the database named "%s" and give access -to the user named "%s". -""" % (dbname, dbuser) - -passwd = getpass.getpass('Please enter your MySQL root password: ') - -db = MySQLdb.connect(user='root', passwd=passwd) -c = db.cursor() -c.execute('DROP DATABASE IF EXISTS %s' % dbname) -c.execute('CREATE DATABASE %s CHARACTER SET utf8' % dbname) -c.execute('GRANT ALL ON %s.* TO %s@localhost identified by %%s' % (dbname, dbuser), (dbpass,)) |