diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-17 23:56:42 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-17 23:56:42 -0700 |
| commit | 79e732bd03c020eab36ceb13c5a712e76df3ac75 (patch) | |
| tree | 48cd2d1b916a8f53beefa6c856677eb5278921f1 /scripts | |
| parent | 19d39b20294bad8dc14df26e76756c558a5083cf (diff) | |
| parent | c14c9e1a086f0de29ef5c37fbeb34f6082b1c5ef (diff) | |
Merge branch '0.8.x' into twitterpriv
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/setup.cfg.sample | 1 | ||||
| -rwxr-xr-x | scripts/setup_status_network.sh | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample index 4194bc146..450b9c30a 100644 --- a/scripts/setup.cfg.sample +++ b/scripts/setup.cfg.sample @@ -2,6 +2,7 @@ # Base database name; full name will include nickname +export DBHOST=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 d80612b94..e1d14593f 100755 --- a/scripts/setup_status_network.sh +++ b/scripts/setup_status_network.sh @@ -11,13 +11,13 @@ export username=$nickname$USERBASE # Create the db -mysqladmin -u $ADMIN --password=$ADMINPASS create $database +mysqladmin -h $DBHOST -u $ADMIN --password=$ADMINPASS create $database for f in laconica.sql sms_carrier.sql foreign_services.sql notice_source.sql; do - mysql -u $ADMIN --password=$ADMINPASS $database < ../db/$f; + mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $database < ../db/$f; done -mysql -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS +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'; |