|
Lines 1-20
Link Here
|
| 1 |
--- etc/createdb.in.orig 2018-04-02 22:52:32 UTC |
1 |
--- etc/createdb.in.orig 2003-01-22 19:07:02 UTC |
| 2 |
+++ etc/createdb.in |
2 |
+++ etc/createdb.in |
| 3 |
@@ -23,11 +23,8 @@ echo "" |
3 |
@@ -15,6 +15,8 @@ |
|
|
4 |
RTGPASS="rtgdefault" |
| 5 |
DATABASE="rtg" |
| 6 |
USER="snmp" |
| 7 |
+MYSQL_FILE=`mktemp -q /tmp/mysql.XXXXXX` |
| 8 |
+RTG_FILE=`mktemp -q /tmp/rtg.XXXXXX` |
| 4 |
|
9 |
|
|
|
10 |
echo "" |
| 11 |
echo "$0 setting up MySQL database for RTG." |
| 12 |
@@ -22,103 +24,98 @@ |
| 13 |
echo "" |
| 14 |
|
| 5 |
# Create the necessary SQL in two /tmp files |
15 |
# Create the necessary SQL in two /tmp files |
| 6 |
cat <<EOT >/tmp/mysql.sql |
16 |
-cat <<EOT >/tmp/mysql.sql |
| 7 |
-INSERT INTO user (Host, User, Password) VALUES ('$HOST','$USER',PASSWORD("$RTGPASS")); |
17 |
-INSERT INTO user (Host, User, Password) VALUES ('$HOST','$USER',PASSWORD("$RTGPASS")); |
| 8 |
-INSERT INTO db (Host, Db, User, Select_priv, Insert_priv, Update_priv, Delete_priv, |
18 |
-INSERT INTO db (Host, Db, User, Select_priv, Insert_priv, Update_priv, Delete_priv, |
| 9 |
-Create_priv, Drop_priv, Grant_priv, References_priv, Index_priv, Alter_priv) |
19 |
-Create_priv, Drop_priv, Grant_priv, References_priv, Index_priv, Alter_priv) |
| 10 |
-VALUES ('$HOST','$DATABASE','$USER','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); |
20 |
-VALUES ('$HOST','$DATABASE','$USER','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); |
| 11 |
-FLUSH PRIVILEGES; |
21 |
-FLUSH PRIVILEGES; |
|
|
22 |
+cat <<EOT >$MYSQL_FILE |
| 12 |
+CREATE USER '$USER'@'$HOST' IDENTIFIED BY '$RTG_PASS'; |
23 |
+CREATE USER '$USER'@'$HOST' IDENTIFIED BY '$RTG_PASS'; |
| 13 |
+GRANT ALL ON '$DATABASE'.* TO '$USER'@'$HOST'; |
24 |
+GRANT ALL ON '$DATABASE'.* TO '$USER'@'$HOST'; |
| 14 |
EOT |
25 |
EOT |
| 15 |
|
26 |
|
| 16 |
cat <<EOT >/tmp/rtg.sql |
27 |
-cat <<EOT >/tmp/rtg.sql |
| 17 |
@@ -35,81 +32,81 @@ cat <<EOT >/tmp/rtg.sql |
28 |
+cat <<EOT >$RTG_FILE |
|
|
29 |
# |
| 18 |
# Table structure for table 'router' |
30 |
# Table structure for table 'router' |
| 19 |
# |
31 |
# |
| 20 |
|
32 |
|
|
Lines 135-146
Link Here
|
| 135 |
); |
147 |
); |
| 136 |
EOT |
148 |
EOT |
| 137 |
|
149 |
|
| 138 |
@@ -117,8 +114,6 @@ echo "Adding user \"$USER\" to MySQL dat |
150 |
echo "Adding user \"$USER\" to MySQL database..." |
| 139 |
cat /tmp/mysql.sql | $MYSQLBIN/mysql -u root -p$ROOTPASS mysql |
151 |
-cat /tmp/mysql.sql | $MYSQLBIN/mysql -u root -p$ROOTPASS mysql |
|
|
152 |
+cat $MYSQL_FILE | $MYSQLBIN/mysql -u root -p$ROOTPASS mysql |
| 140 |
echo "Creating RTG database \"$DATABASE\"..." |
153 |
echo "Creating RTG database \"$DATABASE\"..." |
| 141 |
$MYSQLBIN/mysqladmin -u root -p$ROOTPASS create $DATABASE |
154 |
$MYSQLBIN/mysqladmin -u root -p$ROOTPASS create $DATABASE |
| 142 |
-echo "Reloading MySQL privileges..." |
155 |
-echo "Reloading MySQL privileges..." |
| 143 |
-$MYSQLBIN/mysqladmin -u root -p$ROOTPASS flush-privileges |
156 |
-$MYSQLBIN/mysqladmin -u root -p$ROOTPASS flush-privileges |
| 144 |
echo "Creating RTG tables..." |
157 |
echo "Creating RTG tables..." |
| 145 |
cat /tmp/rtg.sql | $MYSQLBIN/mysql -u $USER -p$RTGPASS $DATABASE |
158 |
-cat /tmp/rtg.sql | $MYSQLBIN/mysql -u $USER -p$RTGPASS $DATABASE |
|
|
159 |
+cat $RTG_FILE | $MYSQLBIN/mysql -u $USER -p$RTGPASS $DATABASE |
| 146 |
echo "Done." |
160 |
echo "Done." |