Commit 613afed0 authored by Marius Burkard's avatar Marius Burkard

- removed xmpp, php modes etc. from sql files

parent ad5661d8
......@@ -10,6 +10,6 @@ UPDATE client SET db_servers = default_dbserver WHERE (db_servers = '' OR db_ser
UPDATE client SET dns_servers = default_dnsserver WHERE (dns_servers = '' OR dns_servers IS NULL);
ALTER TABLE `client_template` ADD `default_slave_dnsserver` INT NOT NULL DEFAULT '0' AFTER `limit_dns_slave_zone`;
ALTER TABLE `client_template` ADD `mail_servers` TEXT NULL DEFAULT NULL AFTER `template_type`;
ALTER TABLE `client_template` ADD `web_servers` TEXT NULL DEFAULT NULL AFTER `limit_xmpp_httparchive`;
ALTER TABLE `client_template` ADD `web_servers` TEXT NULL DEFAULT NULL AFTER `mail_servers`;
ALTER TABLE `client_template` ADD `dns_servers` TEXT NULL DEFAULT NULL AFTER `limit_aps`;
ALTER TABLE `client_template` ADD `db_servers` TEXT NULL DEFAULT NULL AFTER `limit_dns_record`;
\ No newline at end of file
......@@ -108,4 +108,41 @@ ALTER TABLE `xmpp_domain`
-- STRIPDOWN!
ALTER TABLE `web_backup` CHANGE `backup_type` `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web';
ALTER TABLE `web_database_user` DROP COLUMN `database_password_mongo`;
\ No newline at end of file
ALTER TABLE `web_database_user` DROP COLUMN `database_password_mongo`;
ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR(255) NOT NULL DEFAULT 'no,fast-cgi,mod,php-fpm';
ALTER TABLE `client_template`
DROP COLUMN `default_xmppserver`,
DROP COLUMN `xmpp_servers`,
DROP COLUMN `limit_xmpp_domain`,
DROP COLUMN `limit_xmpp_user`,
DROP COLUMN `limit_xmpp_muc`,
DROP COLUMN `limit_xmpp_anon`,
DROP COLUMN `limit_xmpp_vjud`,
DROP COLUMN `limit_xmpp_proxy`,
DROP COLUMN `limit_xmpp_status`,
DROP COLUMN `limit_xmpp_pastebin`,
DROP COLUMN `limit_xmpp_httparchive`,
DROP COLUMN `limit_xmpp_webpresence`,
DROP COLUMN `limit_xmpp_http_upload`;
ALTER TABLE `server` DROP COLUMN `xmpp_server`;
ALTER TABLE `client`
DROP COLUMN `default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
DROP COLUMN `xmpp_servers`,
DROP COLUMN `limit_xmpp_domain`,
DROP COLUMN `limit_xmpp_user`,
DROP COLUMN `limit_xmpp_muc`,
DROP COLUMN `limit_xmpp_anon`,
DROP COLUMN `limit_xmpp_auth_options`,
DROP COLUMN `limit_xmpp_vjud`,
DROP COLUMN `limit_xmpp_proxy`,
DROP COLUMN `limit_xmpp_status`,
DROP COLUMN `limit_xmpp_pastebin`,
DROP COLUMN `limit_xmpp_httparchive`,
DROP COLUMN `limit_xmpp_webpresence`,
DROP COLUMN `limit_xmpp_http_upload`;
DROP TABLE `xmpp_domain`;
DROP TABLE `xmpp_user`;
......@@ -184,24 +184,12 @@ CREATE TABLE `client` (
`limit_spamfilter_wblist` int(11) NOT NULL DEFAULT '0',
`limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
`limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
`default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
`xmpp_servers` text,
`limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
`limit_xmpp_user` int(11) NOT NULL DEFAULT '-1',
`limit_xmpp_muc` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_anon` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_auth_options` varchar(255) NOT NULL DEFAULT 'plain,hashed,isp',
`limit_xmpp_vjud` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_proxy` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_status` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n',
`default_webserver` int(11) unsigned NOT NULL DEFAULT '1',
`web_servers` text,
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
`web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm,hhvm',
`web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,mod,php-fpm',
`limit_cgi` enum('n','y') NOT NULL DEFAULT 'n',
`limit_ssi` enum('n','y') NOT NULL DEFAULT 'n',
`limit_perl` enum('n','y') NOT NULL DEFAULT 'n',
......@@ -315,17 +303,6 @@ CREATE TABLE `client_template` (
`limit_spamfilter_wblist` int(11) NOT NULL default '0',
`limit_spamfilter_user` int(11) NOT NULL default '0',
`limit_spamfilter_policy` int(11) NOT NULL default '0',
`default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
`xmpp_servers` text,
`limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
`limit_xmpp_user` int(11) NOT NULL DEFAULT '-1',
`limit_xmpp_muc` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_anon` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_vjud` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_proxy` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_status` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n',
`limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n',
`web_servers` text,
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL default '-1',
......@@ -1358,7 +1335,6 @@ CREATE TABLE `server` (
`vserver_server` tinyint(1) NOT NULL default '0',
`proxy_server` tinyint(1) NOT NULL default '0',
`firewall_server` tinyint(1) NOT NULL default '0',
`xmpp_server` tinyint(1) NOT NULL default '0',
`config` text,
`updated` bigint(20) unsigned NOT NULL default '0',
`mirror_server_id` int(11) unsigned NOT NULL default '0',
......@@ -2146,87 +2122,6 @@ CREATE TABLE `web_traffic` (
-- --------------------------------------------------------
--
-- Table structure for table `xmpp_domain`
--
CREATE TABLE `xmpp_domain` (
`domain_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) NOT NULL default '',
`sys_perm_group` varchar(5) NOT NULL default '',
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`domain` varchar(255) NOT NULL default '',
`management_method` ENUM( 'normal', 'maildomain' ) NOT NULL default 'normal',
`public_registration` ENUM( 'n', 'y' ) NOT NULL default 'n',
`registration_url` varchar(255) NOT NULL DEFAULT '',
`registration_message` varchar(255) NOT NULL DEFAULT '',
`domain_admins` text,
`use_pubsub` enum('n','y') NOT NULL DEFAULT 'n',
`use_proxy` enum('n','y') NOT NULL DEFAULT 'n',
`use_anon_host` enum('n','y') NOT NULL DEFAULT 'n',
`use_vjud` enum('n','y') NOT NULL DEFAULT 'n',
`vjud_opt_mode` enum('in', 'out') NOT NULL DEFAULT 'in',
`use_muc_host` enum('n','y') NOT NULL DEFAULT 'n',
`muc_name` varchar(30) NOT NULL DEFAULT '',
`muc_restrict_room_creation` enum('n', 'y', 'm') NOT NULL DEFAULT 'm',
`muc_admins` text,
`use_pastebin` enum('n','y') NOT NULL DEFAULT 'n',
`pastebin_expire_after` int(3) NOT NULL DEFAULT 48,
`pastebin_trigger` varchar(10) NOT NULL DEFAULT '!paste',
`use_http_archive` enum('n','y') NOT NULL DEFAULT 'n',
`http_archive_show_join` enum('n', 'y') NOT NULL DEFAULT 'n',
`http_archive_show_status` enum('n', 'y') NOT NULL DEFAULT 'n',
`use_status_host` enum('n','y') NOT NULL DEFAULT 'n',
`ssl_state` varchar(255) NULL,
`ssl_locality` varchar(255) NULL,
`ssl_organisation` varchar(255) NULL,
`ssl_organisation_unit` varchar(255) NULL,
`ssl_country` varchar(255) NULL,
`ssl_email` varchar(255) NULL,
`ssl_request` mediumtext NULL,
`ssl_cert` mediumtext NULL,
`ssl_bundle` mediumtext NULL,
`ssl_key` mediumtext NULL,
`ssl_action` varchar(16) NULL,
`active` enum('n','y') NOT NULL DEFAULT 'n',
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`),
KEY `domain_active` (`domain`,`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
--
-- Table structure for table `xmpp_user`
--
CREATE TABLE `xmpp_user` (
`xmppuser_id` int(11) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL default '0',
`sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) NOT NULL default '',
`sys_perm_group` varchar(5) NOT NULL default '',
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`jid` varchar(255) NOT NULL default '',
`password` varchar(255) NOT NULL default '',
`active` enum('n','y') NOT NULL DEFAULT 'n',
PRIMARY KEY (`xmppuser_id`),
KEY `server_id` (`server_id`,`jid`),
KEY `jid_active` (`jid`,`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
-- --------------------------------------------------------
-- --------------------------------------------------------
-- DB-DATA
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment