diff --git a/src/xrow/eZCluster/CloudSDK.php b/src/xrow/eZCluster/CloudSDK.php index 58dc700..376433c 100644 --- a/src/xrow/eZCluster/CloudSDK.php +++ b/src/xrow/eZCluster/CloudSDK.php @@ -10,6 +10,7 @@ class CloudSDK { const SITES_ROOT = '/var/www/sites'; const USER = 'ec2-user'; + const GROUP = 'apache'; public static $ezcTemplateConfiguration; const CONFIG_FILE = '/etc/ezcluster/ezcluster.xml'; const XML_NAMESPACE = 'http://www.xrow.com/schema/ezcluster'; diff --git a/src/xrow/eZCluster/ClusterNode.php b/src/xrow/eZCluster/ClusterNode.php index 3128712..c1ec1a0 100755 --- a/src/xrow/eZCluster/ClusterNode.php +++ b/src/xrow/eZCluster/ClusterNode.php @@ -568,7 +568,7 @@ public function setupMounts() +auto.master\n"); chmod("/etc/auto.master", 0755); chown("/etc/auto.master", CloudSDK::USER); - chgrp("/etc/auto.master", CloudSDK::USER); + chgrp("/etc/auto.master", CloudSDK::GROUP); $mounts = array(); if (is_array($result)) { foreach ($result as $environment) { diff --git a/src/xrow/eZCluster/ClusterTools.php b/src/xrow/eZCluster/ClusterTools.php index e0d0722..cf6476f 100644 --- a/src/xrow/eZCluster/ClusterTools.php +++ b/src/xrow/eZCluster/ClusterTools.php @@ -351,7 +351,7 @@ static public function isDateTimeinRange( $range, DateTime $dt = null ) return false; } - static public function mkdir( $dir, $user = false, $permissions = 0775 ) + static public function mkdir( $dir, $user = false, $permissions = 0775, $group = CloudSDK::GROUP ) { if ( is_dir( $dir ) ) { @@ -362,7 +362,7 @@ static public function mkdir( $dir, $user = false, $permissions = 0775 ) if ( $user !== false ) { chown( $dir, $user ); - chgrp( $dir, $user ); + chgrp( $dir, $group ); } umask($old); } diff --git a/src/xrow/eZCluster/Resources/environment.php b/src/xrow/eZCluster/Resources/environment.php index bc7c673..b8c5e17 100644 --- a/src/xrow/eZCluster/Resources/environment.php +++ b/src/xrow/eZCluster/Resources/environment.php @@ -226,7 +226,7 @@ public function getVHost() if (! file_exists($dir)) { mkdir($dir, 0777, true); chown($dir, CloudSDK::USER); - chgrp($dir, CloudSDK::USER); + chgrp($dir, CloudSDK::GROUP); } $vhost->name = $this->name; $vhost->hosts = array(); @@ -324,7 +324,7 @@ public function setup() $script = (string) $this->environment["script"]; chmod($this->dirtmp, 0777); chown($this->dirtmp, CloudSDK::USER); - chgrp($this->dirtmp, CloudSDK::USER); + chgrp($this->dirtmp, CloudSDK::GROUP); //checkout & execute if (! empty($this->parameters["SCM"]) and empty($script) and empty( $bootstrap_script )) { @@ -385,7 +385,7 @@ public function setup() } chmod($this->dirtmp, 0777); chown($this->dirtmp, CloudSDK::USER); - chgrp($this->dirtmp, CloudSDK::USER); + chgrp($this->dirtmp, CloudSDK::GROUP); ClusterTools::mkdir($this->docroottmp, CloudSDK::USER, 0777); try { $fs->rename( $this->dir, $this->dir. ".new" );