summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-23 11:22:54 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-23 11:22:54 -0700
commita4402eedb32d0933b11070a1f6f681d020ab270f (patch)
treec5befb05780ccd8dffe19109d1376a1b76ffcb8e /scripts
parente22f73c72bc08aac15ae3eae66ffbb0987d6883e (diff)
use different name for connection and database
Diffstat (limited to 'scripts')
-rw-r--r--scripts/setup.cfg.sample5
-rwxr-xr-xscripts/setup_status_network.sh2
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample
index ef33cd632..8d03b06f5 100644
--- a/scripts/setup.cfg.sample
+++ b/scripts/setup.cfg.sample
@@ -1,8 +1,7 @@
# CONFIGURATION FILE for setup_status_network.sh
-# Base database name; full name will include nickname
-
-export DBHOST=masterdb.example.net
+export DBHOST=localhost
+export DBHOSTNAME=masterdb.example.net
export DBBASE=_example_net
export USERBASE=_example_net
export ADMIN=root
diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index 0261a7f55..17440640e 100755
--- a/scripts/setup_status_network.sh
+++ b/scripts/setup_status_network.sh
@@ -22,7 +22,7 @@ mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS
GRANT INSERT,SELECT,UPDATE,DELETE ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password';
GRANT INSERT,SELECT,UPDATE,DELETE ON $database.* TO '$username'@'%' IDENTIFIED BY '$password';
INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created)
-VALUES ('$nickname', '$DBHOST', '$username', '$password', '$database', '$sitename', now());
+VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now());
ENDOFCOMMANDS