Merge branch 'master' of gitlab.com:interlink-sa/flowdat3/modules/dhcp into 1

app/DoctrineMigrations/Version20180126150719.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use MigrationsBundle\Migrations\MigrationsBase;
-
-class Version20180126150719 extends MigrationsBase
-{
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema)
-    {
-        $this->executeYaml(__DIR__, 'Version20180126150719.yml');
-    }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema)
-    {
-    }
-}

app/DoctrineMigrations/Version20180126150719.yml

@@ -1,5 +0,0 @@
-INSERTORUPDATE:
-    host_type:
-        - id: 1
-          name: "Cablemodem"
-          shortname: "cablemodem"

composer.json

@@ -26,39 +26,39 @@
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
+            "url": "ssh://gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/TemplateBundle.git"
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/TemplateBundle.git"
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git"
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git"
         },
         {
             "type": "vcs",
@@ -69,14 +69,14 @@
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/OwnerVoter.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@bitbucket.org/ikflowdat/migrations.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/migrations.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
@@ -97,14 +97,14 @@
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuthBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/AuditBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
@@ -116,7 +116,7 @@
         },
         {
             "type": "vcs",
-            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
@@ -187,8 +187,9 @@
         "doctrine-update": "php bin/console doctrine:schema:update --force",
         "doctrine-migrations-down": "php bin/console doctrine:migrations:migrate --no-interaction first -vvv",
         "doctrine-migrations": "php bin/console doctrine:migrations:migrate --no-interaction -vvv",
-        "auto-increment": "php bin/console baseadmin:autoincrement",
+        "auto-increment": "php bin/console baseadmin:autoincrement --tables='action,dhcp,host_type,workflow'",
         "workflow-default": "php bin/console workflow:default --class=HostBundle\\\\Entity\\\\Host --all",
+        "update-data": "php bin/console ik:update:data '/opt/dhcp/app/DoctrineMigrations/src/'",
         "symfony-scripts": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
@@ -203,9 +204,10 @@
             "@mkdir-dir-cache-sessions-logs",
             "@chmod-dir-cache-sessions-logs",
             "@doctrine-update",
-            "@auto-increment",
+            "@update-data",
             "@doctrine-migrations-down",
             "@doctrine-migrations",
+            "@auto-increment",
             "@workflow-default"
         ],
         "post-update-cmd": [

composer.lock

@@ -925,7 +925,7 @@
             "version": "v2.5.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/doctrine2.git",
+                "url": "https://github.com/doctrine/orm.git",
                 "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff"
             },
             "dist": {
@@ -1411,7 +1411,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
-                "reference": "40eba41d6b036daf98dc98c0bfe44e79f1253378"
+                "reference": "34dece40daad7031e332f02314b681bb9ee1cd14"
             },
             "require": {
                 "simplethings/entity-audit-bundle": "^1.0"
@@ -1427,7 +1427,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2018-11-16T17:52:06+00:00"
+            "time": "2019-01-31T13:32:40+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1435,7 +1435,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
-                "reference": "f5d0128e028ec87a37de9e7e45e2c3f9ff1f5927"
+                "reference": "c8e77dce32b92c08d75e12c537ead77bf976cd84"
             },
             "type": "library",
             "autoload": {
@@ -1450,7 +1450,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2018-10-01T14:16:36+00:00"
+            "time": "2019-01-31T13:33:33+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1458,7 +1458,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "3671a15664ea6f19d2ca6ed1915522389b62b600"
+                "reference": "a2b2110a69a21e2691266d66e421d2e56dff1c8a"
             },
             "type": "library",
             "autoload": {
@@ -1473,7 +1473,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2019-01-21T12:13:01+00:00"
+            "time": "2019-02-11T17:28:26+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1481,7 +1481,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "2ab9cef5cd82805c9d9c752130213eac485412d1"
+                "reference": "5a72c912f13ba8728fda6792d867e61a889e6c06"
             },
             "type": "library",
             "autoload": {
@@ -1496,7 +1496,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2018-11-16T18:28:19+00:00"
+            "time": "2019-01-31T13:35:09+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1504,7 +1504,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
-                "reference": "c85d52d5e306faaa44f9d45353365d00f10adf2d"
+                "reference": "77c2c8228bb9dfd13add559909fd809508b61388"
             },
             "type": "library",
             "autoload": {
@@ -1519,7 +1519,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2018-12-14T11:31:02+00:00"
+            "time": "2019-01-31T13:44:14+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1550,7 +1550,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
-                "reference": "1c60fd91f1bb0fe5125da70908670629d4d341e6"
+                "reference": "a057890183bddcb6f4c431c3b7c9afe6839d8d78"
             },
             "require": {
                 "ext-curl": "*",
@@ -1569,7 +1569,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2018-12-04T13:12:24+00:00"
+            "time": "2019-01-31T13:37:25+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1577,7 +1577,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
-                "reference": "9171fd2335cc3d164a97a27f0531e436ef924701"
+                "reference": "ece1ca1df9ca18789ccdcae19a381ee5d9142f6c"
             },
             "type": "library",
             "autoload": {
@@ -1592,7 +1592,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2018-02-19T13:34:58+00:00"
+            "time": "2019-01-31T13:18:32+00:00"
         },
         {
             "name": "ik/template-bundle",
@@ -1600,7 +1600,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/TemplateBundle.git",
-                "reference": "97a0f5c1d73edf039cbf046ba7b2ee8e7ef14575"
+                "reference": "2c02107d2ec87aad3fca45adc94f6e69f3aa0119"
             },
             "require": {
                 "ik/base-admin-bundle": "*"
@@ -1618,7 +1618,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2019-01-04T12:24:24+00:00"
+            "time": "2019-01-31T13:32:01+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1626,7 +1626,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "99d58259071e639cf59760e96a5063c98b5e7a43"
+                "reference": "68f356b67da08b94cdb7613ad58c5525c88ff950"
             },
             "require": {
                 "ext-curl": "*",
@@ -1639,7 +1639,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2019-01-11T18:05:23+00:00"
+            "time": "2019-01-31T13:36:09+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1647,7 +1647,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "c56c95f3145caf7965392a711efaee0643329383"
+                "reference": "29bc76615564c555cc3c98cf4c0e27d70b7bfa08"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1677,7 +1677,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2019-01-11T18:20:57+00:00"
+            "time": "2019-02-06T17:56:50+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",