summaryrefslogtreecommitdiffstats
path: root/setup
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-17 21:37:04 +0200
committerBjörn Geiger2011-08-17 21:37:04 +0200
commitca909063775e71ab891f7861d095982739855f39 (patch)
tree5ccc901adf09c1c89cd28efe146424a753f5f74e /setup
parentsome checkStatus logic implemented (diff)
downloadpoolctrl-ca909063775e71ab891f7861d095982739855f39.tar.gz
poolctrl-ca909063775e71ab891f7861d095982739855f39.tar.xz
poolctrl-ca909063775e71ab891f7861d095982739855f39.zip
Client nun mit ip bzw. ip6
Diffstat (limited to 'setup')
-rw-r--r--setup/poolctrl.sql11
-rw-r--r--setup/poolctrl_data.sql30
2 files changed, 17 insertions, 24 deletions
diff --git a/setup/poolctrl.sql b/setup/poolctrl.sql
index 975d4c7..e1badbd 100644
--- a/setup/poolctrl.sql
+++ b/setup/poolctrl.sql
@@ -96,6 +96,8 @@ CREATE TABLE IF NOT EXISTS `pbs_client` (
`groupID` int(11) NOT NULL,
`macadress` varchar(17) NOT NULL,
`hardwarehash` varchar(32),
+ `ip` varchar(15) NOT NULL,
+ `ip6` varchar(45),
`created` int(15),
PRIMARY KEY (`clientID`),
KEY `groupID` (`groupID`)
@@ -151,15 +153,6 @@ CREATE TABLE IF NOT EXISTS `pbs_membership` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-- Constraints
-ALTER TABLE `pbs_filter`
- ADD CONSTRAINT `pbs_filter_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL,
- ADD CONSTRAINT `pbs_filter_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE,
- ADD CONSTRAINT `pbs_filter_ibfk_3` FOREIGN KEY (`bootmenuID`) REFERENCES `pbs_bootmenu` (`bootmenuID`) ON DELETE CASCADE;
-
-ALTER TABLE `pbs_bootmenu`
- ADD CONSTRAINT `pbs_bootmenu_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL,
- ADD CONSTRAINT `pbs_bootmenu_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE;
-
ALTER TABLE `pbs_bootos`
ADD CONSTRAINT `pbs_bootos_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE,
ADD CONSTRAINT `pbs_bootos_ibfk_3` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL;
diff --git a/setup/poolctrl_data.sql b/setup/poolctrl_data.sql
index 174914b..b699a14 100644
--- a/setup/poolctrl_data.sql
+++ b/setup/poolctrl_data.sql
@@ -29,21 +29,21 @@ INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `
INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '8', '1', '1', 'apikey8');
-- Adding clients
-INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VALUES
-(1, 1, 'a5:9a:0f:94:2a:b0', 'ea9b82d9de911bc2d3cd23f53a6cab48'),
-(2, 1, '91:91:f1:e2:99:aa', '1e2b1599710fbbef0dc789e8cfe12455'),
-(3, 1, '6e:5c:82:78:f2:39', '8f6209ca3d6b35e223a11c249d1b69fc'),
-(4, 1, '67:75:e9:f2:5f:8e', 'e17ab09f3586464f19629e2e8b1e9a9d'),
-(5, 1, '63:51:7e:22:aa:72', '9bf70279d283b85440c2031c19bb6812'),
-(6, 1, '68:9e:fe:47:95:c5', 'ad3bce4464a6267441ec144744439c7e'),
-(7, 1, '6e:1c:2e:01:77:33', 'e8d7e80d79f224771b7a3a0af4e02748'),
-(8, 1, 'd1:91:20:43:2f:dd', 'ded66ce272f384e9e386c1b57ded3e4d'),
-(9, 1, '1b:0f:a5:82:47:16', '695610ee509c060b1fca9c8011529af4'),
-(10, 1, '56:8e:7b:03:5f:98', 'a3562c8cad2a4fa4fc11656025dc911b'),
-(11, 2, 'af:54:07:87:63:44', '98413218152196816519841365419816'),
-(12, 2, '87:21:74:52:96:20', '98741298132516132169813516981616'),
-(13, 2, '14:47:58:47:36:48', '32168132068132068513216053516513'),
-(14, 1, '64:46:85:A1:89:23', '9684216842068420616841asd6516984');
+INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`, `ip`, `ip6`) VALUES
+(1, 1, 'a5:9a:0f:94:2a:b0', 'ea9b82d9de911bc2d3cd23f53a6cab48', '132.230.5.6', ''),
+(2, 1, '91:91:f1:e2:99:aa', '1e2b1599710fbbef0dc789e8cfe12455', '', ''),
+(3, 1, '6e:5c:82:78:f2:39', '8f6209ca3d6b35e223a11c249d1b69fc', '', ''),
+(4, 1, '67:75:e9:f2:5f:8e', 'e17ab09f3586464f19629e2e8b1e9a9d', '84.23.56.86', ''),
+(5, 1, '63:51:7e:22:aa:72', '9bf70279d283b85440c2031c19bb6812', '70.81.94.222', ''),
+(6, 1, '68:9e:fe:47:95:c5', 'ad3bce4464a6267441ec144744439c7e', '210.84.65.2', ''),
+(7, 1, '6e:1c:2e:01:77:33', 'e8d7e80d79f224771b7a3a0af4e02748', '', ''),
+(8, 1, 'd1:91:20:43:2f:dd', 'ded66ce272f384e9e386c1b57ded3e4d', '', ''),
+(9, 1, '1b:0f:a5:82:47:16', '695610ee509c060b1fca9c8011529af4', '132.230.10.2', ''),
+(10, 1, '56:8e:7b:03:5f:98', 'a3562c8cad2a4fa4fc11656025dc911b', '132.20.20.2', ''),
+(11, 2, 'af:54:07:87:63:44', '98413218152196816519841365419816', '', ''),
+(12, 2, '87:21:74:52:96:20', '98741298132516132169813516981616', '', ''),
+(13, 2, '14:47:58:47:36:48', '32168132068132068513216053516513', '', ''),
+(14, 1, '64:46:85:A1:89:23', '9684216842068420616841asd6516984', '', '');
-- Adding bootos
INSERT INTO `pbs_bootos` (`bootosID`, `groupID`, `membershipID`, `title`, `description`, `defaultkcl`, `created`, `expires`, `public`, `source`, `distro`, `distroversion`, `shortname`, `share`) VALUES