diff --git a/public_html/deployment/plugins/rollout/ssh/rollout_ssh.php b/public_html/deployment/plugins/rollout/ssh/rollout_ssh.php index f4e38fcb2b224705895f0c8590fdb7e8c0de8e24..012fe813de13bf416271e4fb693f5ac941797a92 100644 --- a/public_html/deployment/plugins/rollout/ssh/rollout_ssh.php +++ b/public_html/deployment/plugins/rollout/ssh/rollout_ssh.php @@ -36,7 +36,6 @@ class rollout_ssh extends rollout_base { public function getDeployCommands($sPhase,$bMask=false){ $aReturn=array(); $aConfig=$this->getConfig($sPhase); - $aTargethosts = explode(',', $aConfig['hosts']); // loop over hosts and create shell commands for it foreach(explode(',', $aConfig['hosts']) as $sMyHost){ diff --git a/public_html/deployment/plugins/shellcmd/load/plugin.php b/public_html/deployment/plugins/shellcmd/load/plugin.php index 0188143f6dd8d1534d43ea6edf929fc33aa61813..1c6655bedc1a32af59d67b4188e0734802f57a6b 100644 --- a/public_html/deployment/plugins/shellcmd/load/plugin.php +++ b/public_html/deployment/plugins/shellcmd/load/plugin.php @@ -8,11 +8,10 @@ */ class shellcmd_load { /** - * @var command line to exectute + * @var fallback command line to exectute; command in config.josn has priority */ protected $_command='uptime'; - /** * constructor ... returns command * @return string @@ -35,7 +34,7 @@ class shellcmd_load { return $this->_command; } - + /** * parse output and extract wanted values in section "data" * @return array diff --git a/public_html/deployment/plugins/shellcmd/plugins_shellcmd.class.php b/public_html/deployment/plugins/shellcmd/plugins_shellcmd.class.php index 747d07f1d985bc81230c4954a136cdb017c282d7..19516e8092df6cc4b5d5f0a6550f8f5f0d26a195 100644 --- a/public_html/deployment/plugins/shellcmd/plugins_shellcmd.class.php +++ b/public_html/deployment/plugins/shellcmd/plugins_shellcmd.class.php @@ -14,6 +14,7 @@ class shellcmd { protected $_oPlugin=false; protected $_aReturn=false; + protected $_aResult=[]; protected $_debug=false; /** @@ -90,8 +91,9 @@ class shellcmd { if (!$this->_oPlugin){ return $this->_aReturn; } - - $sCmd=$this->_oPlugin->getCommand(); + $sInfofile=$this->_sPlugin.'/config.json'; + $aMeta=json_decode(file_get_contents($sInfofile), 1); + $sCmd=isset($aMeta['command']) ? $aMeta['command'] : $this->_oPlugin->getCommand(); $this->_wd("sCmd=$sCmd"); $this->_aResult=$this->_execCommand($sCmd); diff --git a/public_html/deployment/plugins/shellcmd/processes/plugin.php b/public_html/deployment/plugins/shellcmd/processes/plugin.php index ae008a51d90879de707eb01ea4b43a290f2e06f8..327065c94cc3cad91780ff755620ca42986b8447 100644 --- a/public_html/deployment/plugins/shellcmd/processes/plugin.php +++ b/public_html/deployment/plugins/shellcmd/processes/plugin.php @@ -8,10 +8,9 @@ */ class shellcmd_processes { /** - * @var command line to exectute + * @var fallback command line to exectute; command in config.josn has priority */ - protected $_command="ps -f --forest | egrep -v '[/\ ](apache|httpd|php-fpm)' | fgrep -v 'ps -f' | fgrep -v grep"; - // protected $_command="ps -ef --forest "; + protected $_command="ps -ef --forest "; /** * constructor ... returns command