Skip to content

Commit 4924229

Browse files
author
janatzend
committed
added i5 support for Path processing
1 parent 03dd1e4 commit 4924229

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

ZendServer/DepH/Path/Path.php

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ class Path {
1111
const DIR_PREFIX = '/usr/local/zend';
1212
const DIR_APPS = '/usr/local/zend/var/apps';
1313
const SITES_D_DIR = '/usr/local/zend/etc/sites.d';
14+
15+
const DIR_PREFIX_I5 = '/usr/local/zendsvr6';
16+
const DIR_APPS_I5 = '/usr/local/zendsvr6/var/apps';
17+
const SITES_D_DIR_I5 = '/usr/local/zendsvr6/etc/sites.d';
18+
1419
const DEFAULT_VHOST_FILENAME = 'zend-default-vhost-80.conf';
1520

1621
/**
@@ -36,6 +41,14 @@ public function setParams (Params $params) {
3641
public function setShell (Shell $shell) {
3742
$this->shell = $shell;
3843
}
44+
45+
public function getSitesDDir() {
46+
if (strpos(php_uname(), "OS400") !== false) {
47+
return self::SITES_D_DIR_I5;
48+
}
49+
50+
return self::SITES_D_DIR;
51+
}
3952

4053
/**
4154
* Returns filename of original Zend Server vhost file
@@ -45,14 +58,14 @@ public function getVirtualHostFile() {
4558
$applicationBaseDir = $this->params->getApplicationBaseDir();
4659

4760
if (strpos($applicationBaseDir, '__default__') > 0) {
48-
return self::SITES_D_DIR. '/' . self::DEFAULT_VHOST_FILENAME;
61+
return $this->getSitesDDir() . '/' . self::DEFAULT_VHOST_FILENAME;
4962
}
5063

5164
$virtualHostFile = str_replace(self::DIR_APPS, '', $applicationBaseDir);
5265
$virtualHostFile = str_replace($this->params->getCurrentAppVersion(), '', $virtualHostFile);
5366
$virtualHostFile = trim(rtrim($virtualHostFile, '/'));
5467
$virtualHostFile = str_replace('/', '_', $virtualHostFile) . '.conf';
55-
$virtualHostFile = self::SITES_D_DIR. '/vhost' . $virtualHostFile;
68+
$virtualHostFile = $this->getSitesDDir() . '/vhost' . $virtualHostFile;
5669

5770
return $virtualHostFile;
5871
}
@@ -105,6 +118,10 @@ public function getUrlPath() {
105118
* @return string
106119
*/
107120
public function getAppsDir() {
121+
if (strpos(php_uname(), "OS400") !== false) {
122+
return self::DIR_APPS_I5;
123+
}
124+
108125
return self::DIR_APPS;
109126
}
110127

0 commit comments

Comments
 (0)