Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

2 files changed, 44 insertions, 7 deletions

diff --git a/pbs-newdata.sql b/pbs-newdata.sql
index e10ce02..0c1fffb 100644
--- a/pbs-newdata.sql
+++ b/pbs-newdata.sql
@@ -69,12 +69,28 @@ INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VAL
 (14, 1, '64:46:85:A1:89:23', '9684216842068420616841asd6516984');
 
 -- Adding config
-INSERT INTO `pbs_config` (`configID`, `title`, `groupID`, `membershipID`, `shellscript`, `created`) VALUES
-(1, 'Config 1', 1, null, 'shellscript 1', '1299693677'),
-(2, 'Config 2', 1, null, 'shellskript 2', '1299693690'),
-(3, 'Config 3', 1, null, 'shellskript 3', '1299693690'),
-(4, 'Config 4', null, 1, 'shellskript 4', '1299693690'),
-(5, 'Config 5', null, 1, 'shellskript 5', '1299693690');
+INSERT INTO `pbs_config` (`configID`, `title`, `groupID`, `membershipID`, `visible`, `created`) VALUES
+(1, 'Config 1', 1, null, '1', '1299693677'),
+(2, 'Config 2', 1, null, '0', '1299693690'),
+(3, 'Config 3', 1, null, '1', '1299693690'),
+(4, 'Config 4', null, 1, '1', '1299693690'),
+(5, 'Config 5', null, 1, '1', '1299693690');
+
+-- Adding bootosuser
+INSERT INTO `pbs_bootosuser` (`bootosuserID`, `configID`, `login`, `password`, `homepath`, `hometypeID`) VALUES
+(1, 1, 'login1', 'password1', null, 0),
+(2, 1, 'login2', 'password2', null, 1),
+(3, 1, 'login3', 'password3', '/home/bla/blub', 2),
+(4, 4, 'login4', 'password4', null, 0),
+(5, 4, 'login5', 'password5', null, 1);
+
+-- Adding hometype
+INSERT INTO `pbs_hometype` (`hometypeID`, `name`) VALUES
+(0, 'standard'),
+(1, 'usbstick'),
+(2, 'custom path'),
+(3, 'extern'),
+(4, 'dropbox');
 
 -- Adding bootos
 INSERT INTO `pbs_bootos` (`bootosID`, `path_config`, `groupID`, `membershipID`, `title`, `description`, `path_init`, `path_kernel`, `defaultkcl`, `created`, `expires`, `public`, `source`, `distro`, `distroversion`, `shortname`, `share`) VALUES
diff --git a/pbs.sql b/pbs.sql
index 3b6f5d7..ebcdbef 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -122,7 +122,7 @@ CREATE TABLE IF NOT EXISTS `pbs_config` (
   `title` varchar(30) NOT NULL,
   `groupID` int(11),
   `membershipID` int(11),
-  `shellscript` text NOT NULL,
+  `visible` tinyint(1) DEFAULT '0',
   `created` VARCHAR(14) NOT NULL,
   PRIMARY KEY (`configID`),
   KEY `groupID` (`groupID`),
@@ -133,7 +133,28 @@ ALTER TABLE `pbs_config`
   ADD CONSTRAINT `pbs_config_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE CASCADE,
   ADD CONSTRAINT `pbs_config_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE;
 
+CREATE TABLE IF NOT EXISTS `pbs_hometype` (
+  `hometypeID` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) NOT NULL,
+  PRIMARY KEY (`hometypeID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;
   
+CREATE TABLE IF NOT EXISTS `pbs_bootosuser` (
+  `bootosuserID` int(11) NOT NULL AUTO_INCREMENT,
+  `configID` int(11) NOT NULL,
+  `login` varchar(30) NOT NULL,
+  `password` varchar(30) NOT NULL,
+  `homepath` varchar(140),
+  `hometypeID` int(11),
+  PRIMARY KEY (`bootosuserID`),
+  KEY `configID` (`configID`),
+  KEY `hometypeID` (`hometypeID`)  
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
+
+ALTER TABLE `pbs_bootosuser`
+  ADD CONSTRAINT `pbs_bootosuser_ibfk_1` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`) ON DELETE CASCADE;
+
+
 CREATE TABLE IF NOT EXISTS `pbs_bootos` (
   `bootosID` int(11) NOT NULL AUTO_INCREMENT,
   `groupID` int(11) NOT NULL,