Skip to content

Commit 613afed

Browse files
author
Marius Burkard
committed
- removed xmpp, php modes etc. from sql files
1 parent ad5661d commit 613afed

File tree

3 files changed

+40
-108
lines changed

3 files changed

+40
-108
lines changed

‎install/sql/incremental/upd_0083.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ UPDATE client SET db_servers = default_dbserver WHERE (db_servers = '' OR db_ser
1010
UPDATE client SET dns_servers = default_dnsserver WHERE (dns_servers = '' OR dns_servers IS NULL);
1111
ALTER TABLE `client_template` ADD `default_slave_dnsserver` INT NOT NULL DEFAULT '0' AFTER `limit_dns_slave_zone`;
1212
ALTER TABLE `client_template` ADD `mail_servers` TEXT NULL DEFAULT NULL AFTER `template_type`;
13-
ALTER TABLE `client_template` ADD `web_servers` TEXT NULL DEFAULT NULL AFTER `limit_xmpp_httparchive`;
13+
ALTER TABLE `client_template` ADD `web_servers` TEXT NULL DEFAULT NULL AFTER `mail_servers`;
1414
ALTER TABLE `client_template` ADD `dns_servers` TEXT NULL DEFAULT NULL AFTER `limit_aps`;
1515
ALTER TABLE `client_template` ADD `db_servers` TEXT NULL DEFAULT NULL AFTER `limit_dns_record`;

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,41 @@ ALTER TABLE `xmpp_domain`
108108

109109
-- STRIPDOWN!
110110
ALTER TABLE `web_backup` CHANGE `backup_type` `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web';
111-
ALTER TABLE `web_database_user` DROP COLUMN `database_password_mongo`;
111+
ALTER TABLE `web_database_user` DROP COLUMN `database_password_mongo`;
112+
ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR(255) NOT NULL DEFAULT 'no,fast-cgi,mod,php-fpm';
113+
ALTER TABLE `client_template`
114+
DROP COLUMN `default_xmppserver`,
115+
DROP COLUMN `xmpp_servers`,
116+
DROP COLUMN `limit_xmpp_domain`,
117+
DROP COLUMN `limit_xmpp_user`,
118+
DROP COLUMN `limit_xmpp_muc`,
119+
DROP COLUMN `limit_xmpp_anon`,
120+
DROP COLUMN `limit_xmpp_vjud`,
121+
DROP COLUMN `limit_xmpp_proxy`,
122+
DROP COLUMN `limit_xmpp_status`,
123+
DROP COLUMN `limit_xmpp_pastebin`,
124+
DROP COLUMN `limit_xmpp_httparchive`,
125+
DROP COLUMN `limit_xmpp_webpresence`,
126+
DROP COLUMN `limit_xmpp_http_upload`;
127+
128+
ALTER TABLE `server` DROP COLUMN `xmpp_server`;
129+
130+
ALTER TABLE `client`
131+
DROP COLUMN `default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
132+
DROP COLUMN `xmpp_servers`,
133+
DROP COLUMN `limit_xmpp_domain`,
134+
DROP COLUMN `limit_xmpp_user`,
135+
DROP COLUMN `limit_xmpp_muc`,
136+
DROP COLUMN `limit_xmpp_anon`,
137+
DROP COLUMN `limit_xmpp_auth_options`,
138+
DROP COLUMN `limit_xmpp_vjud`,
139+
DROP COLUMN `limit_xmpp_proxy`,
140+
DROP COLUMN `limit_xmpp_status`,
141+
DROP COLUMN `limit_xmpp_pastebin`,
142+
DROP COLUMN `limit_xmpp_httparchive`,
143+
DROP COLUMN `limit_xmpp_webpresence`,
144+
DROP COLUMN `limit_xmpp_http_upload`;
145+
146+
147+
DROP TABLE `xmpp_domain`;
148+
DROP TABLE `xmpp_user`;

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -184,24 +184,12 @@ CREATE TABLE `client` (
184184
`limit_spamfilter_wblist` int(11) NOT NULL DEFAULT '0',
185185
`limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
186186
`limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
187-
`default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
188-
`xmpp_servers` text,
189-
`limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
190-
`limit_xmpp_user` int(11) NOT NULL DEFAULT '-1',
191-
`limit_xmpp_muc` ENUM( 'n', 'y' ) NOT NULL default 'n',
192-
`limit_xmpp_anon` ENUM( 'n', 'y' ) NOT NULL default 'n',
193-
`limit_xmpp_auth_options` varchar(255) NOT NULL DEFAULT 'plain,hashed,isp',
194-
`limit_xmpp_vjud` ENUM( 'n', 'y' ) NOT NULL default 'n',
195-
`limit_xmpp_proxy` ENUM( 'n', 'y' ) NOT NULL default 'n',
196-
`limit_xmpp_status` ENUM( 'n', 'y' ) NOT NULL default 'n',
197-
`limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n',
198-
`limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n',
199187
`default_webserver` int(11) unsigned NOT NULL DEFAULT '1',
200188
`web_servers` text,
201189
`limit_web_ip` text,
202190
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
203191
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
204-
`web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm,hhvm',
192+
`web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,mod,php-fpm',
205193
`limit_cgi` enum('n','y') NOT NULL DEFAULT 'n',
206194
`limit_ssi` enum('n','y') NOT NULL DEFAULT 'n',
207195
`limit_perl` enum('n','y') NOT NULL DEFAULT 'n',
@@ -315,17 +303,6 @@ CREATE TABLE `client_template` (
315303
`limit_spamfilter_wblist` int(11) NOT NULL default '0',
316304
`limit_spamfilter_user` int(11) NOT NULL default '0',
317305
`limit_spamfilter_policy` int(11) NOT NULL default '0',
318-
`default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
319-
`xmpp_servers` text,
320-
`limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
321-
`limit_xmpp_user` int(11) NOT NULL DEFAULT '-1',
322-
`limit_xmpp_muc` ENUM( 'n', 'y' ) NOT NULL default 'n',
323-
`limit_xmpp_anon` ENUM( 'n', 'y' ) NOT NULL default 'n',
324-
`limit_xmpp_vjud` ENUM( 'n', 'y' ) NOT NULL default 'n',
325-
`limit_xmpp_proxy` ENUM( 'n', 'y' ) NOT NULL default 'n',
326-
`limit_xmpp_status` ENUM( 'n', 'y' ) NOT NULL default 'n',
327-
`limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n',
328-
`limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n',
329306
`web_servers` text,
330307
`limit_web_ip` text,
331308
`limit_web_domain` int(11) NOT NULL default '-1',
@@ -1358,7 +1335,6 @@ CREATE TABLE `server` (
13581335
`vserver_server` tinyint(1) NOT NULL default '0',
13591336
`proxy_server` tinyint(1) NOT NULL default '0',
13601337
`firewall_server` tinyint(1) NOT NULL default '0',
1361-
`xmpp_server` tinyint(1) NOT NULL default '0',
13621338
`config` text,
13631339
`updated` bigint(20) unsigned NOT NULL default '0',
13641340
`mirror_server_id` int(11) unsigned NOT NULL default '0',
@@ -2146,87 +2122,6 @@ CREATE TABLE `web_traffic` (
21462122

21472123
-- --------------------------------------------------------
21482124

2149-
--
2150-
-- Table structure for table `xmpp_domain`
2151-
--
2152-
2153-
CREATE TABLE `xmpp_domain` (
2154-
`domain_id` int(11) unsigned NOT NULL auto_increment,
2155-
`sys_userid` int(11) unsigned NOT NULL default '0',
2156-
`sys_groupid` int(11) unsigned NOT NULL default '0',
2157-
`sys_perm_user` varchar(5) NOT NULL default '',
2158-
`sys_perm_group` varchar(5) NOT NULL default '',
2159-
`sys_perm_other` varchar(5) NOT NULL default '',
2160-
`server_id` int(11) unsigned NOT NULL default '0',
2161-
`domain` varchar(255) NOT NULL default '',
2162-
2163-
`management_method` ENUM( 'normal', 'maildomain' ) NOT NULL default 'normal',
2164-
`public_registration` ENUM( 'n', 'y' ) NOT NULL default 'n',
2165-
`registration_url` varchar(255) NOT NULL DEFAULT '',
2166-
`registration_message` varchar(255) NOT NULL DEFAULT '',
2167-
`domain_admins` text,
2168-
2169-
`use_pubsub` enum('n','y') NOT NULL DEFAULT 'n',
2170-
`use_proxy` enum('n','y') NOT NULL DEFAULT 'n',
2171-
`use_anon_host` enum('n','y') NOT NULL DEFAULT 'n',
2172-
2173-
`use_vjud` enum('n','y') NOT NULL DEFAULT 'n',
2174-
`vjud_opt_mode` enum('in', 'out') NOT NULL DEFAULT 'in',
2175-
2176-
`use_muc_host` enum('n','y') NOT NULL DEFAULT 'n',
2177-
`muc_name` varchar(30) NOT NULL DEFAULT '',
2178-
`muc_restrict_room_creation` enum('n', 'y', 'm') NOT NULL DEFAULT 'm',
2179-
`muc_admins` text,
2180-
`use_pastebin` enum('n','y') NOT NULL DEFAULT 'n',
2181-
`pastebin_expire_after` int(3) NOT NULL DEFAULT 48,
2182-
`pastebin_trigger` varchar(10) NOT NULL DEFAULT '!paste',
2183-
`use_http_archive` enum('n','y') NOT NULL DEFAULT 'n',
2184-
`http_archive_show_join` enum('n', 'y') NOT NULL DEFAULT 'n',
2185-
`http_archive_show_status` enum('n', 'y') NOT NULL DEFAULT 'n',
2186-
`use_status_host` enum('n','y') NOT NULL DEFAULT 'n',
2187-
2188-
`ssl_state` varchar(255) NULL,
2189-
`ssl_locality` varchar(255) NULL,
2190-
`ssl_organisation` varchar(255) NULL,
2191-
`ssl_organisation_unit` varchar(255) NULL,
2192-
`ssl_country` varchar(255) NULL,
2193-
`ssl_email` varchar(255) NULL,
2194-
`ssl_request` mediumtext NULL,
2195-
`ssl_cert` mediumtext NULL,
2196-
`ssl_bundle` mediumtext NULL,
2197-
`ssl_key` mediumtext NULL,
2198-
`ssl_action` varchar(16) NULL,
2199-
2200-
`active` enum('n','y') NOT NULL DEFAULT 'n',
2201-
PRIMARY KEY (`domain_id`),
2202-
KEY `server_id` (`server_id`,`domain`),
2203-
KEY `domain_active` (`domain`,`active`)
2204-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
2205-
2206-
-- --------------------------------------------------------
2207-
2208-
--
2209-
-- Table structure for table `xmpp_user`
2210-
--
2211-
2212-
CREATE TABLE `xmpp_user` (
2213-
`xmppuser_id` int(11) unsigned NOT NULL auto_increment,
2214-
`sys_userid` int(11) unsigned NOT NULL default '0',
2215-
`sys_groupid` int(11) unsigned NOT NULL default '0',
2216-
`sys_perm_user` varchar(5) NOT NULL default '',
2217-
`sys_perm_group` varchar(5) NOT NULL default '',
2218-
`sys_perm_other` varchar(5) NOT NULL default '',
2219-
`server_id` int(11) unsigned NOT NULL default '0',
2220-
`jid` varchar(255) NOT NULL default '',
2221-
`password` varchar(255) NOT NULL default '',
2222-
`active` enum('n','y') NOT NULL DEFAULT 'n',
2223-
PRIMARY KEY (`xmppuser_id`),
2224-
KEY `server_id` (`server_id`,`jid`),
2225-
KEY `jid_active` (`jid`,`active`)
2226-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
2227-
2228-
-- --------------------------------------------------------
2229-
22302125
-- --------------------------------------------------------
22312126
-- --------------------------------------------------------
22322127
-- DB-DATA

0 commit comments

Comments
 (0)