Browse Source

Ignore workflow_list.yml y posibilidad de generarlo con workflow_list.yml.dist

Maximiliano Schvindt 8 năm trước cách đây
mục cha
commit
2089af3e1a
4 tập tin đã thay đổi với 15 bổ sung7 xóa
  1. 1 1
      .gitignore
  2. 0 0
      app/Resources/workflows/workflow_list.yml.dist
  3. 1 1
      app/config/config.yml
  4. 13 5
      composer.json

+ 1 - 1
.gitignore

@@ -16,4 +16,4 @@
 !var/SymfonyRequirements.php
 /vendor/
 /web/bundles/
-/app/Resources/workflows/*
+app/Resources/workflows/workflow_list.yml

app/Resources/workflows/workflow_list.yml → app/Resources/workflows/workflow_list.yml.dist


+ 1 - 1
app/config/config.yml

@@ -7,7 +7,7 @@ imports:
     - { resource: "@FTTHBundle/Resources/config/services.yml" }
     - { resource: "@WebserviceBundle/Resources/config/services.yml" }
     - { resource: workflow.yml }
-    - { resource: "../Resources/workflows/workflow_list.yml" }
+    - { resource: "../Resources/workflows/workflow_list.yml", ignore_errors: true  }
     - { resource: "@WorkflowBundle/Resources/config/services.yml" }
     - { resource: "hwioauthbundle/parameters.yml" }
     - { resource: "@BaseOAuthClientBundle/Resources/config/services.yml" }

+ 13 - 5
composer.json

@@ -70,6 +70,11 @@
         "symfony/phpunit-bridge": "^3.0"
     },
     "scripts": {
+        "workflows-commands": [
+            "chown -Rf www-data:www-data app/Resources/workflows",
+            "cp -n app/Resources/workflows/workflow_list.yml.dist app/Resources/workflows/workflow_list.yml",
+            "chown -Rf www-data:www-data app/Resources/workflows/workflow_list.yml"
+        ],
         "symfony-scripts": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
@@ -78,14 +83,17 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
         ],
+        "chmod-dir-cache-sessions-logs":"chmod 777 -R var/cache var/logs var/sessions",
         "post-install-cmd": [
-            "@symfony-scripts"
+            "@workflows-commands",
+            "@symfony-scripts",
+            "@chmod-dir-cache-sessions-logs"
         ],
         "post-update-cmd": [
-            "@symfony-scripts"
-        ],
-        "apache-permissions-workflow-dir":"chown -Rf www-data:www-data app/Resources/workflows",
-        "chmod-dir-cache-sessions-logs":"chmod 777 -R var/cache var/logs var/sessions"
+            "@workflows-commands",
+            "@symfony-scripts",
+            "@chmod-dir-cache-sessions-logs"
+        ]
     },
     "extra": {
         "symfony-app-dir": "app",