From d71bae3c642575d667fade0d342f81d2f724e4c9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 22 Aug 2012 07:26:25 -0400
Subject: [PATCH] Added code to remove the domain module to the installer.

---
 install/sql/ispconfig3.sql |   45 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 88a6884..5777459 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -179,6 +179,15 @@
   `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',
+  `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',
+  `limit_ruby` enum('n','y') NOT NULL DEFAULT 'n',
+  `limit_python` enum('n','y') NOT NULL DEFAULT 'n',
+  `force_suexec` enum('n','y') NOT NULL DEFAULT 'y',
+  `limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
+  `limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
+  `limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
   `limit_web_subdomain` int(11) NOT NULL DEFAULT '-1',
   `limit_web_aliasdomain` int(11) NOT NULL DEFAULT '-1',
   `limit_ftp_user` int(11) NOT NULL DEFAULT '-1',
@@ -265,6 +274,15 @@
   `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',
+  `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',
+  `limit_ruby` enum('n','y') NOT NULL DEFAULT 'n',
+  `limit_python` enum('n','y') NOT NULL DEFAULT 'n',
+  `force_suexec` enum('n','y') NOT NULL DEFAULT 'y',
+  `limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
+  `limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
+  `limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
   `limit_web_subdomain` int(11) NOT NULL default '-1',
   `limit_web_aliasdomain` int(11) NOT NULL default '-1',
   `limit_ftp_user` int(11) NOT NULL default '-1',
@@ -1598,16 +1616,36 @@
   `parent_domain_id` int(11) unsigned NOT NULL DEFAULT  '0',
   `type` varchar(16) NOT NULL DEFAULT 'y',
   `database_name` varchar(64) DEFAULT NULL,
-  `database_user` varchar(64) DEFAULT NULL,
-  `database_password` varchar(64) DEFAULT NULL,
+  `database_user_id` int(11) unsigned DEFAULT NULL,
+  `database_ro_user_id` int(11) unsigned DEFAULT NULL,
   `database_charset` varchar(64) DEFAULT NULL,
   `remote_access` enum('n','y') NOT NULL DEFAULT 'y',
   `remote_ips` text NOT NULL,
   `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
   `backup_copies` INT NOT NULL DEFAULT '1',
   `active` enum('n','y') NOT NULL DEFAULT 'y',
-  PRIMARY KEY (`database_id`)
+  PRIMARY KEY (`database_id`),
+  KEY `database_user_id` (`database_user_id`),
+  KEY `database_ro_user_id` (`database_ro_user_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `web_database_user`
+--
+
+CREATE TABLE IF NOT EXISTS `web_database_user` (
+  `database_user_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) DEFAULT NULL,
+  `sys_perm_group` varchar(5) DEFAULT NULL,
+  `sys_perm_other` varchar(5) DEFAULT NULL,
+  `database_user` varchar(64) DEFAULT NULL,
+  `database_password` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`database_user_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -1630,6 +1668,7 @@
   `parent_domain_id` int(11) unsigned NOT NULL default '0',
   `vhost_type` varchar(32) default NULL,
   `document_root` varchar(255) default NULL,
+  `web_folder` varchar(100) default NULL,
   `system_user` varchar(255) default NULL,
   `system_group` varchar(255) default NULL,
   `hd_quota` bigint(20) NOT NULL default '0',

--
Gitblit v1.9.1