summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-23 12:53:32 +0200
committerBjörn Geiger2011-08-23 12:53:32 +0200
commit8330ef3af184ab23d1e95b3e3ff615c8359a3f71 (patch)
treeab8f156d01d5a3c7599008cd46c0f3371be8594f
parentgitignor geändert (diff)
downloadpoolctrl-8330ef3af184ab23d1e95b3e3ff615c8359a3f71.tar.gz
poolctrl-8330ef3af184ab23d1e95b3e3ff615c8359a3f71.tar.xz
poolctrl-8330ef3af184ab23d1e95b3e3ff615c8359a3f71.zip
Black und Whitelist wird nun übergeben
-rw-r--r--application/controllers/EventController.php12
-rw-r--r--application/controllers/GearmanController.php36
2 files changed, 48 insertions, 0 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 1367109..3a36cc1 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -596,6 +596,18 @@ class EventController extends Zend_Controller_Action
'waitTime' => $this->gearmanWorkerWaitTime,
'host' => $this->gearmanServerHost,
'port' => $this->gearmanServerPort,
+ 'blacklist' => array(
+ 0 => 'firefox-bin',
+ 1 => 'chromium-browse',
+ 2 => 'thunderbird-bi',
+ 3 => 'evince',
+ 4 => 'soffice.bin',
+ 5 => 'eclipse',
+ ),
+ 'whitelist' => array(
+ 0 => 'gnome-screensav',
+ 1 => 'Kscreensaver',
+ ),
);
$poolRequest = "poolid=" . $event->getPbs_poolID();
$this->config['pbs2']['getpools'];
diff --git a/application/controllers/GearmanController.php b/application/controllers/GearmanController.php
index 8e0252f..8e022db 100644
--- a/application/controllers/GearmanController.php
+++ b/application/controllers/GearmanController.php
@@ -107,6 +107,18 @@ class GearmanController extends Zend_Controller_Action
'waitTime' => $this->gearmanWorkerWaitTime,
'host' => $this->gearmanServerHost,
'port' => $this->gearmanServerPort,
+ 'blacklist' => array(
+ 0 => 'firefox-bin',
+ 1 => 'chromium-browse',
+ 2 => 'thunderbird-bi',
+ 3 => 'evince',
+ 4 => 'soffice.bin',
+ 5 => 'eclipse',
+ ),
+ 'whitelist' => array(
+ 0 => 'gnome-screensav',
+ 1 => 'Kscreensaver',
+ ),
'clients' => array(
0 => array('id' => '1', 'ip' =>'132.230.4.24', 'mac' =>'00:13:72:C7:FD:A1'),
),
@@ -130,6 +142,18 @@ class GearmanController extends Zend_Controller_Action
'waitTime' => $this->gearmanWorkerWaitTime,
'host' => $this->gearmanServerHost,
'port' => $this->gearmanServerPort,
+ 'blacklist' => array(
+ 0 => 'firefox-bin',
+ 1 => 'chromium-browse',
+ 2 => 'thunderbird-bi',
+ 3 => 'evince',
+ 4 => 'soffice.bin',
+ 5 => 'eclipse',
+ ),
+ 'whitelist' => array(
+ 0 => 'gnome-screensav',
+ 1 => 'Kscreensaver',
+ ),
'clients' => array(
0 => array('id' => '1', 'ip' =>'132.230.4.24', 'mac' =>'00:13:72:C7:FD:A1'),
),
@@ -153,6 +177,18 @@ class GearmanController extends Zend_Controller_Action
'waitTime' => $this->gearmanWorkerWaitTime,
'host' => $this->gearmanServerHost,
'port' => $this->gearmanServerPort,
+ 'blacklist' => array(
+ 0 => 'firefox-bin',
+ 1 => 'chromium-browse',
+ 2 => 'thunderbird-bi',
+ 3 => 'evince',
+ 4 => 'soffice.bin',
+ 5 => 'eclipse',
+ ),
+ 'whitelist' => array(
+ 0 => 'gnome-screensav',
+ 1 => 'Kscreensaver',
+ ),
'clients' => array(
0 => array('id' => '1', 'ip' =>'132.230.4.121', 'mac' =>'00:1e:0b:a6:f8:19'),
0 => array('id' => '2', 'ip' =>'132.230.4.122', 'mac' =>'00:1e:0b:a6:d5:de'),