1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
--- etc/createdb.in.orig 2018-04-02 22:52:32 UTC
+++ etc/createdb.in
@@ -23,11 +23,8 @@ echo ""
# Create the necessary SQL in two /tmp files
cat <<EOT >/tmp/mysql.sql
-INSERT INTO user (Host, User, Password) VALUES ('$HOST','$USER',PASSWORD("$RTGPASS"));
-INSERT INTO db (Host, Db, User, Select_priv, Insert_priv, Update_priv, Delete_priv,
-Create_priv, Drop_priv, Grant_priv, References_priv, Index_priv, Alter_priv)
-VALUES ('$HOST','$DATABASE','$USER','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
-FLUSH PRIVILEGES;
+CREATE USER '$USER'@'$HOST' IDENTIFIED BY '$RTG_PASS';
+GRANT ALL ON '$DATABASE'.* TO '$USER'@'$HOST';
EOT
cat <<EOT >/tmp/rtg.sql
@@ -35,81 +32,81 @@ cat <<EOT >/tmp/rtg.sql
# Table structure for table 'router'
#
-CREATE TABLE router (
- rid int(11) unsigned NOT NULL auto_increment,
- name char(120) NOT NULL default '',
- pop char(10) NOT NULL default '',
- popid tinyint(3) unsigned NOT NULL default '0',
- PRIMARY KEY (rid)
+CREATE TABLE `router` (
+ `rid` int(11) unsigned NOT NULL auto_increment,
+ `name` char(120) NOT NULL default '',
+ `pop` char(10) NOT NULL default '',
+ `popid` tinyint(3) unsigned NOT NULL default '0',
+ PRIMARY KEY (`rid`)
);
#
# Table structure for table 'interface'
#
-CREATE TABLE interface (
- id int(11) unsigned NOT NULL auto_increment,
- name char(255) NOT NULL default '',
- rid int(11) NOT NULL default '0',
- speed bigint(11) default NULL,
- description char(255) default NULL,
- status enum('active','inactive') default 'active',
- PRIMARY KEY (id)
+CREATE TABLE `interface` (
+ `id` int(11) unsigned NOT NULL auto_increment,
+ `name` char(255) NOT NULL default '',
+ `rid` int(11) NOT NULL default '0',
+ `speed` bigint(11) default NULL,
+ `description` char(255) default NULL,
+ `status` enum('active','inactive') default 'active',
+ PRIMARY KEY (`id`)
);
#
# Table structure for table 'ifInOctets'
#
-CREATE TABLE ifInOctets (
- id int(11) NOT NULL default '0',
- dtime datetime NOT NULL default '0000-00-00 00:00:00',
- counter bigint(20) NOT NULL default '0',
- KEY ifInOctets_idx (dtime)
+CREATE TABLE `ifInOctets` (
+ `id` int(11) NOT NULL default '0',
+ `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
+ `counter` bigint(20) NOT NULL default '0',
+ KEY `ifInOctets_idx` (`dtime`)
);
#
# Table structure for table 'ifOutOctets'
#
-CREATE TABLE ifOutOctets (
- id int(11) NOT NULL default '0',
- dtime datetime NOT NULL default '0000-00-00 00:00:00',
- counter bigint(20) NOT NULL default '0',
- KEY ifOutOctets_idx (dtime)
+CREATE TABLE `ifOutOctets` (
+ `id` int(11) NOT NULL default '0',
+ `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
+ `counter` bigint(20) NOT NULL default '0',
+ KEY `ifOutOctets_idx` (`dtime`)
);
#
# Table structure for table 'ifInUcastPkts'
#
-CREATE TABLE ifInUcastPkts (
- id int(11) NOT NULL default '0',
- dtime datetime NOT NULL default '0000-00-00 00:00:00',
- counter bigint(20) NOT NULL default '0',
- KEY ifInUcastPkts_idx (dtime)
+CREATE TABLE `ifInUcastPkts` (
+ `id` int(11) NOT NULL default '0',
+ `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
+ `counter` bigint(20) NOT NULL default '0',
+ KEY `ifInUcastPkts_idx` (`dtime`)
);
#
# Table structure for table 'ifOutUcastPkts'
#
-CREATE TABLE ifOutUcastPkts (
- id int(11) NOT NULL default '0',
- dtime datetime NOT NULL default '0000-00-00 00:00:00',
- counter bigint(20) NOT NULL default '0',
- KEY ifOutUcastPkts_idx (dtime)
+CREATE TABLE `ifOutUcastPkts` (
+ `id` int(11) NOT NULL default '0',
+ `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
+ `counter` bigint(20) NOT NULL default '0',
+ KEY `ifOutUcastPkts_idx` (`dtime`)
);
#
# Table structure for table 'ifInErrors'
#
-CREATE TABLE ifInErrors (
- id int(11) NOT NULL default '0',
- dtime datetime NOT NULL default '0000-00-00 00:00:00',
- counter bigint(20) NOT NULL default '0',
- KEY ifInErrors_idx (dtime)
+CREATE TABLE `ifInErrors` (
+ `id` int(11) NOT NULL default '0',
+ `dtime` datetime NOT NULL default '0000-00-00 00:00:00',
+ `counter` bigint(20) NOT NULL default '0',
+ KEY `ifInErrors_idx` (`dtime`)
);
EOT
@@ -117,8 +114,6 @@ echo "Adding user \"$USER\" to MySQL dat
cat /tmp/mysql.sql | $MYSQLBIN/mysql -u root -p$ROOTPASS mysql
echo "Creating RTG database \"$DATABASE\"..."
$MYSQLBIN/mysqladmin -u root -p$ROOTPASS create $DATABASE
-echo "Reloading MySQL privileges..."
-$MYSQLBIN/mysqladmin -u root -p$ROOTPASS flush-privileges
echo "Creating RTG tables..."
cat /tmp/rtg.sql | $MYSQLBIN/mysql -u $USER -p$RTGPASS $DATABASE
echo "Done."
|
