Browse Source

加入更新到 v0.8 的 sql 文件

James Iter 7 years ago
parent
commit
f0764e8b67

+ 1 - 1
jimvc/themes/default/static/widgets/screenfull/screenfull.js

@@ -82,7 +82,7 @@
 			// keyboard in fullscreen even though it doesn't.
 			// Browser sniffing, since the alternative with
 			// setTimeout is even worse.
-			if (/5\.1[\.\d]* Safari/.test(navigator.userAgent)) {
+			if (/5\.1[\.\d]* Safari|Chrome/.test(navigator.userAgent)) {
 				elem[request]();
 			} else {
 				elem[request](keyboardAllowed && Element.ALLOW_KEYBOARD_INPUT);

+ 1 - 8
misc/init.sql

@@ -198,13 +198,6 @@ CREATE TABLE IF NOT EXISTS config(
     storage_path VARCHAR(255) NOT NULL,
     vm_network VARCHAR(255) NOT NULL,
     vm_manage_network VARCHAR(255) NOT NULL,
-    start_ip CHAR(15) NOT NULL,
-    end_ip CHAR(15) NOT NULL,
-    start_vnc_port INT UNSIGNED NOT NULL,
-    netmask CHAR(15) NOT NULL,
-    gateway CHAR(15) NOT NULL,
-    dns1 CHAR(15) NOT NULL DEFAULT '223.5.5.5',
-    dns2 CHAR(15) NOT NULL DEFAULT '8.8.8.8',
     iops_base BIGINT UNSIGNED NOT NULL DEFAULT 0,
     iops_pre_unit BIGINT UNSIGNED NOT NULL DEFAULT 0,
     iops_cap BIGINT UNSIGNED NOT NULL DEFAULT 0,
@@ -464,7 +457,7 @@ CREATE TABLE IF NOT EXISTS ip_pool(
     ENGINE=Innodb
     DEFAULT CHARSET=utf8;
 
-ALTER TABLE ip_pools ADD INDEX (name);
+ALTER TABLE ip_pool ADD INDEX (name);
 
 
 INSERT INTO project (name, description, create_time) VALUES ('我的项目', '由 JimV 创建的默认项目。', UNIX_TIMESTAMP(NOW()) * 1000000);

+ 31 - 0
misc/v0.7_to_v0.8/update.sql

@@ -0,0 +1,31 @@
+CREATE TABLE IF NOT EXISTS ip_pool(
+    id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+    start_ip CHAR(15) NOT NULL,
+    end_ip CHAR(15) NOT NULL,
+    netmask CHAR(15) NOT NULL,
+    gateway CHAR(15) NOT NULL,
+    dns1 CHAR(15) NOT NULL DEFAULT '223.5.5.5',
+    dns2 CHAR(15) NOT NULL DEFAULT '8.8.8.8',
+    activity TINYINT UNSIGNED NOT NULL DEFAULT 0,
+    name VARCHAR(127) NOT NULL,
+    description TEXT,
+    create_time BIGINT UNSIGNED NOT NULL,
+    PRIMARY KEY (id))
+    ENGINE=Innodb
+    DEFAULT CHARSET=utf8;
+
+ALTER TABLE ip_pool ADD INDEX (name);
+
+INSERT INTO ip_pool (start_ip, end_ip, netmask, gateway, dns1, dns2, activity, name, description, create_time)
+    SELECT start_ip, end_ip, netmask, gateway, dns1, dns2, 1, 'Default', '默认 IP 池。', UNIX_TIMESTAMP(NOW()) * 1000000
+    FROM config;
+
+ALTER TABLE config
+    DROP COLUMN start_ip,
+    DROP COLUMN end_ip,
+    DROP COLUMN start_vnc_port,
+    DROP COLUMN netmask,
+    DROP COLUMN gateway,
+    DROP COLUMN dns1,
+    DROP COLUMN dns2;
+