|
@@ -50,9 +50,9 @@ class Release extends Command
|
|
|
*/
|
|
|
private $_domain;
|
|
|
/**
|
|
|
- * @var string Contiene el dominio que se agrega al final de la linea.
|
|
|
+ * @var string Contiene el nombre del cliente.
|
|
|
*/
|
|
|
- private $_domain_behind;
|
|
|
+ private $_client;
|
|
|
/**
|
|
|
* @var array Contiene todos los modulos para la instalacion.
|
|
|
*/
|
|
@@ -76,7 +76,6 @@ class Release extends Command
|
|
|
$this->_mysql_user = "iksop";
|
|
|
$this->_mysql_pass = "235r2342gtfsw";
|
|
|
$this->_mysql_root_pass = "235r2342gtfsw";
|
|
|
- $this->_domain_behind = "flowdat.com";
|
|
|
$this->_docker_restart_default = "on-failure:10";
|
|
|
$this->_modules = array();
|
|
|
$this->_ansible_vars = array();
|
|
@@ -236,9 +235,9 @@ class Release extends Command
|
|
|
}
|
|
|
$this->_domain = $input->getOption("domain");
|
|
|
$this->_client = $input->getOption("client");
|
|
|
- if(!$this->_client){
|
|
|
- $this->_client = basename(realpath($dir));
|
|
|
- }
|
|
|
+ if (!$this->_client) {
|
|
|
+ $this->_client = basename(realpath($dir));
|
|
|
+ }
|
|
|
$docker_tag = $input->getOption("docker-tag");
|
|
|
|
|
|
$this->_ansible_vars["DOMAIN"] = $this->_domain;
|
|
@@ -285,8 +284,6 @@ class Release extends Command
|
|
|
} catch (\Throwable $error) {
|
|
|
var_dump($error->getTraceAsString(), $error->getCode(), $error->getMessage());
|
|
|
} finally {
|
|
|
- $this->_OAUTH_CLIENT_SECRET = null;
|
|
|
- $this->_OAUTH_CLIENT_ID = null;
|
|
|
$this->_dObj = null;
|
|
|
$this->_modules = null;
|
|
|
}
|
|
@@ -1023,7 +1020,7 @@ class Release extends Command
|
|
|
*/
|
|
|
private function getDomain($module)
|
|
|
{
|
|
|
- return $module . "." . $this->_domain . "." . $this->_domain_behind;
|
|
|
+ return $module . "." . $this->_client . "." . $this->_domain;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1060,8 +1057,8 @@ class Release extends Command
|
|
|
$all = "[all]\n";
|
|
|
foreach ($composer->getServices() as $key => $value) {
|
|
|
$tmp .= "[$key]\n";
|
|
|
- $tmp .= $this->_domain . "_" . $key . "_1\n\n";
|
|
|
- $all .= $this->_domain . "_" . $key . "_1\n";
|
|
|
+ $tmp .= $this->_client . "_" . $key . "_1\n\n";
|
|
|
+ $all .= $this->_client . "_" . $key . "_1\n";
|
|
|
}
|
|
|
|
|
|
$this->_dObj->file("inventory.ini")->content($tmp . $all);
|