|
|
@@ -179,7 +179,7 @@ inventory=inventory.ini
|
|
|
->addLinks("mysql")
|
|
|
->addLinks("base")
|
|
|
->addLinks("amqp")
|
|
|
- ->addLinks("base", "base.".$fd_domain)
|
|
|
+ ->addLinks("base", "base.".$domain)
|
|
|
|
|
|
->addEnv_file("ftth.oauth.env")
|
|
|
->addEnviroment("VIRTUAL_HOST", "ftth.".$domain)
|
|
|
@@ -213,11 +213,11 @@ inventory=inventory.ini
|
|
|
->addVolumes("./stats/", "/opt/stats")
|
|
|
->addEnv_file("stats.oauth.env")
|
|
|
|
|
|
- ->addEnviroment("VIRTUAL_HOST", "stats.".$fd_domain)
|
|
|
- ->addEnviroment("HOST_FTTH", "ftth.".$fd_domain)
|
|
|
- ->addEnviroment("HOST_STATS", "stats.".$fd_domain)
|
|
|
- ->addEnviroment("HOST_MAPAS", "mapas.".$fd_domain)
|
|
|
- ->addEnviroment("HOST_BASE", "base.".$fd_domain)
|
|
|
+ ->addEnviroment("VIRTUAL_HOST", "stats.".$domain)
|
|
|
+ ->addEnviroment("HOST_FTTH", "ftth.".$domain)
|
|
|
+ ->addEnviroment("HOST_STATS", "stats.".$domain)
|
|
|
+ ->addEnviroment("HOST_MAPAS", "mapas.".$domain)
|
|
|
+ ->addEnviroment("HOST_BASE", "base.".$domain)
|
|
|
//->addEnviroment("OAUTH_CLIENT_ID", $oauth_client)
|
|
|
//->addEnviroment("OAUTH_CLIENT_SECRET", $oauth_client_secret)
|
|
|
//->addEnviroment("HTTPS_METHOD", "nohttps")
|
|
|
@@ -257,10 +257,11 @@ inventory=inventory.ini
|
|
|
function addNginx($composer, $config = array(), $flavor = "dev"){
|
|
|
$version = "latest";
|
|
|
$domain = "fd3.flowdat.com";
|
|
|
+ $host_env_file = "host.env"
|
|
|
extract($config);
|
|
|
|
|
|
$composer->addService("nginx")->build("extra/nginx/")
|
|
|
- ->image($registry."fd3/nginx:".$v)
|
|
|
+ ->image($registry."fd3/nginx:".$version)
|
|
|
->addEnv_file($host_env_file)
|
|
|
->restart("always")
|
|
|
->addPorts(80, 80)
|
|
|
@@ -335,13 +336,14 @@ $oauth_client_secret = "5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k";
|
|
|
|
|
|
$composer = new FileFormat2("../");
|
|
|
|
|
|
- $base_vars = array("version" => $version, "domain" => $fd_domain, "registry" => $registry);
|
|
|
+ $base_vars = array("version" => $version, "host_env_file" => $host_env_file, "domain" => $fd_domain, "registry" => $registry);
|
|
|
+
|
|
|
+ $this->addNginx($composer, $base_vars);
|
|
|
|
|
|
$this->addBase($composer, $base_vars);
|
|
|
$this->addFtth($composer, $base_vars);
|
|
|
$this->addStats($composer, $base_vars);
|
|
|
$this->addMapas($composer, $base_vars);
|
|
|
- $this->addNginx($composer, $base_vars);
|
|
|
|
|
|
|
|
|
|
Luciano Andrade