Repository: incubator-guacamole-client Updated Branches: refs/heads/staging/0.9.13-incubating 193089fb6 -> 80b681e18
GUACAMOLE-189: Define guacd override columns for guacamole_connection table in main schema init script. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/8286b21b Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/8286b21b Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/8286b21b Branch: refs/heads/staging/0.9.13-incubating Commit: 8286b21baad0f3a7a380b41299b547b73c11f74d Parents: 24708cf Author: Michael Jumper <mjum...@apache.org> Authored: Sun Jun 4 16:06:16 2017 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Sun Jun 4 16:06:16 2017 -0700 ---------------------------------------------------------------------- .../schema/001-create-schema.sql | 5 +++++ .../schema/001-create-schema.sql | 14 ++++++++++++++ 2 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/8286b21b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql index 29bc47a..519d5ca 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql @@ -57,6 +57,11 @@ CREATE TABLE `guacamole_connection` ( `parent_id` int(11), `protocol` varchar(32) NOT NULL, + -- Guacamole proxy (guacd) overrides + `proxy_port` integer, + `proxy_hostname` varchar(512), + `proxy_encryption_method` enum('NONE', 'SSL'), + -- Concurrency limits `max_connections` int(11), `max_connections_per_user` int(11), http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/8286b21b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql index f9b2351..e018617 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql @@ -50,6 +50,15 @@ CREATE TYPE guacamole_system_permission_type AS ENUM( ); -- +-- Guacamole proxy (guacd) encryption methods +-- + +CREATE TYPE guacamole_proxy_encryption_method AS ENUM( + 'NONE', + 'SSL' +); + +-- -- Table of connection groups. Each connection group has a name. -- @@ -97,6 +106,11 @@ CREATE TABLE guacamole_connection ( max_connections integer, max_connections_per_user integer, + -- Guacamole proxy (guacd) overrides + proxy_port integer, + proxy_hostname varchar(512), + proxy_encryption_method guacamole_proxy_encryption_method, + PRIMARY KEY (connection_id), CONSTRAINT connection_name_parent