From d4383e6b96e36120669cc6de2f2cec49aeee90f4 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Tue, 28 May 2013 16:06:44 +0200 Subject: sqlite3: Rename the delta script to avoid merge issues Seems delta-2 was already "taken" in master. Signed-off-by: David Sommerseth --- database/sqlite/sql-schema-delta-2.sql | 38 ---------------------------------- database/sqlite/sql-schema-delta-3.sql | 38 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 database/sqlite/sql-schema-delta-2.sql create mode 100644 database/sqlite/sql-schema-delta-3.sql (limited to 'database/sqlite') diff --git a/database/sqlite/sql-schema-delta-2.sql b/database/sqlite/sql-schema-delta-2.sql deleted file mode 100644 index b21899d..0000000 --- a/database/sqlite/sql-schema-delta-2.sql +++ /dev/null @@ -1,38 +0,0 @@ --- --- eurephia database schema for SQLite3 --- --- This SQL scripts updates the previous SQL schema to the --- new schema needed by edb-sqlite v1.4 --- --- GPLv2 only - Copyright (C) 2013 --- David Sommerseth --- --- This program is free software; you can redistribute it and/or --- modify it under the terms of the GNU General Public License --- as published by the Free Software Foundation; version 2 --- of the License. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- - --- eurephia_plugins - Defines loadable eurephia plug-ins --- This table is parsed upon start-up of OpenVPN/eurephia -CREATE TABLE eurephia_plugins ( - plgname varchar(32) NOT NULL, -- short name of the plug-in module - plgtype varchar(16) NOT NULL, -- plug-in type (auth, firewall, etc) - plgdsofile text NOT NULL, -- full path to the plug-in DSO file - plgconfig text , -- Optional config data for the plug-in - plgenabled boolean NOT NULL, -- Enable/disable the plug-in - plgid integer PRIMARY KEY AUTOINCREMENT -); -CREATE INDEX eurephia_plugins_name_type ON eurephia_plugins (plgname, plgtype); - -ALTER TABLE openvpn_usercerts ADD COLUMN authplugin integer; -ALTER TABLE openvpn_usercerts ADD COLUMN authusername text; diff --git a/database/sqlite/sql-schema-delta-3.sql b/database/sqlite/sql-schema-delta-3.sql new file mode 100644 index 0000000..b21899d --- /dev/null +++ b/database/sqlite/sql-schema-delta-3.sql @@ -0,0 +1,38 @@ +-- +-- eurephia database schema for SQLite3 +-- +-- This SQL scripts updates the previous SQL schema to the +-- new schema needed by edb-sqlite v1.4 +-- +-- GPLv2 only - Copyright (C) 2013 +-- David Sommerseth +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; version 2 +-- of the License. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + +-- eurephia_plugins - Defines loadable eurephia plug-ins +-- This table is parsed upon start-up of OpenVPN/eurephia +CREATE TABLE eurephia_plugins ( + plgname varchar(32) NOT NULL, -- short name of the plug-in module + plgtype varchar(16) NOT NULL, -- plug-in type (auth, firewall, etc) + plgdsofile text NOT NULL, -- full path to the plug-in DSO file + plgconfig text , -- Optional config data for the plug-in + plgenabled boolean NOT NULL, -- Enable/disable the plug-in + plgid integer PRIMARY KEY AUTOINCREMENT +); +CREATE INDEX eurephia_plugins_name_type ON eurephia_plugins (plgname, plgtype); + +ALTER TABLE openvpn_usercerts ADD COLUMN authplugin integer; +ALTER TABLE openvpn_usercerts ADD COLUMN authusername text; -- cgit