Merge branch 'master' of https://bitbucket.org/ikflowdat/installer

tools/mysql/freeradius/schema.sql

@@ -4,7 +4,7 @@ USE freeradius;
 CREATE TABLE IF NOT EXISTS `badusers` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
   `UserName` varchar(30) DEFAULT NULL,
-  `Date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `Date` datetime DEFAULT NULL,
   `Reason` varchar(200) DEFAULT NULL,
   `Admin` varchar(30) DEFAULT '-',
   PRIMARY KEY (`id`),
@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS `badusers` (
 CREATE TABLE IF NOT EXISTS `mtotacct` (
   `MTotAcctId` bigint(21) NOT NULL AUTO_INCREMENT,
   `UserName` varchar(64) NOT NULL DEFAULT '',
-  `AcctDate` date NOT NULL DEFAULT '0000-00-00',
+  `AcctDate` date DEFAULT NULL,
   `ConnNum` bigint(12) DEFAULT NULL,
   `ConnTotDuration` bigint(12) DEFAULT NULL,
   `ConnMaxDuration` bigint(12) DEFAULT NULL,
@@ -204,7 +204,7 @@ CREATE TABLE IF NOT EXISTS `radusergroup` (
 CREATE TABLE IF NOT EXISTS `totacct` (
   `TotAcctId` bigint(21) NOT NULL AUTO_INCREMENT,
   `UserName` varchar(64) NOT NULL DEFAULT '',
-  `AcctDate` date NOT NULL DEFAULT '0000-00-00',
+  `AcctDate` date DEFAULT NULL,
   `ConnNum` bigint(12) DEFAULT NULL,
   `ConnTotDuration` bigint(12) DEFAULT NULL,
   `ConnMaxDuration` bigint(12) DEFAULT NULL,

tools/src/Release.php

@@ -95,6 +95,7 @@ class Release extends Command
         $this->_mysql_user = "iksop";
         $this->_mysql_pass = "235r2342gtfsw";
         $this->_mysql_root_pass = "235r2342gtfsw";
+        $this->_mysql_max_connections = 10000;
         $this->_docker_restart_default = "on-failure:10";
         $this->_user_system = ['users' =>
             [
@@ -269,7 +270,6 @@ class Release extends Command
                 }
                 $this->_domain = $input->getOption("domain");
                 $this->_client = $input->getOption("client");
-                $this->_dir = realpath($dir);
 
                 if (!$this->_client) {
                     $this->_client = basename(realpath($this->directory));
@@ -635,7 +635,9 @@ class Release extends Command
             array(
                 "MYSQL_ROOT_PASSWORD" => $this->_mysql_root_pass,
                 "MYSQL_USER" => $this->_mysql_user,
-                "MYSQL_PASSWORD" => $this->_mysql_pass));
+                "MYSQL_PASSWORD" => $this->_mysql_pass,
+                "MYSQL_MAX_CONNECTIONS" => $this->_mysql_max_connections,
+        ));
     }
 
     function addRedis(FileFormat2 $composer, $config = array(), $flavor = "dev")
@@ -836,6 +838,21 @@ class Release extends Command
         ->addEnviroment("AMQP_KEY", "ftth")
         ->addVolumes("./ftth/", "/opt/ftth");
 
+        $composer
+        ->addService("cablemodem_tasklogger_worker")
+        ->image($registry . "fd3/cablemodem:" . $version)
+        ->build("./cablemodem/")
+        ->command("bin/console rabbitmq:consumer flowdat_tasklogger")
+        ->restart($this->_docker_restart_default)
+        ->addLinks("mysql")
+        ->addLinks("base")
+        ->addLinks("amqp")
+        ->addLinks("nginx", $this->getDomain("base"))
+        ->addEnv_file("running.env")
+        ->addEnv_file("host.env")
+        ->addEnviroment("AMQP_KEY", "cablemodem")
+        ->addVolumes("./cablemodem/", "/opt/cablemodem");
+
         $composer
         ->addService("stats_command_worker")
         ->image($registry . "fd3/stats:" . $version)