From 03079698ac93797992ee1c796e23d0b29e304775 Mon Sep 17 00:00:00 2001 From: Piou-piou Date: Sat, 12 Oct 2019 20:51:29 +0200 Subject: [PATCH 1/7] [func] add PiouPiou RibsCronBundle --- .../ribs-cron-bundle/1.0.0/config/ribs_cron.yaml | 3 +++ piou-piou/ribs-cron-bundle/1.0.0/manifest.json | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 piou-piou/ribs-cron-bundle/1.0.0/config/ribs_cron.yaml create mode 100644 piou-piou/ribs-cron-bundle/1.0.0/manifest.json diff --git a/piou-piou/ribs-cron-bundle/1.0.0/config/ribs_cron.yaml b/piou-piou/ribs-cron-bundle/1.0.0/config/ribs_cron.yaml new file mode 100644 index 00000000..2e38ee21 --- /dev/null +++ b/piou-piou/ribs-cron-bundle/1.0.0/config/ribs_cron.yaml @@ -0,0 +1,3 @@ +parameters: + data_directory: '%kernel.project_dir%/data/' + ribs_cron: diff --git a/piou-piou/ribs-cron-bundle/1.0.0/manifest.json b/piou-piou/ribs-cron-bundle/1.0.0/manifest.json new file mode 100644 index 00000000..12420d9c --- /dev/null +++ b/piou-piou/ribs-cron-bundle/1.0.0/manifest.json @@ -0,0 +1,12 @@ +{ + "bundles": { + "PiouPiou\\RibsCronBundle\\RibsCronBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + }, + "env": { + "IP_CRON_EXTERNAL": "", + "IP_CRON_INTERNAL": "127.0.0.1" + } +} From 200de7646d4b3f16cda610206a866589c963a63b Mon Sep 17 00:00:00 2001 From: Piou-piou Date: Sat, 12 Oct 2019 20:53:49 +0200 Subject: [PATCH 2/7] [edit] RibsCronBundle version dir --- nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml | 2 +- piou-piou/ribs-cron-bundle/{1.0.0 => 1.0}/config/ribs_cron.yaml | 0 piou-piou/ribs-cron-bundle/{1.0.0 => 1.0}/manifest.json | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename piou-piou/ribs-cron-bundle/{1.0.0 => 1.0}/config/ribs_cron.yaml (100%) rename piou-piou/ribs-cron-bundle/{1.0.0 => 1.0}/manifest.json (100%) diff --git a/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml b/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml index 4e684794..30767e1e 100644 --- a/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml +++ b/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml @@ -3,7 +3,7 @@ nelmio_api_doc: info: title: My App description: This is an awesome app! - version: 1.0.0 + version: 1.0 areas: # to filter documented areas path_patterns: - ^/api(?!/doc$) # Accepts routes under /api except /api/doc diff --git a/piou-piou/ribs-cron-bundle/1.0.0/config/ribs_cron.yaml b/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml similarity index 100% rename from piou-piou/ribs-cron-bundle/1.0.0/config/ribs_cron.yaml rename to piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml diff --git a/piou-piou/ribs-cron-bundle/1.0.0/manifest.json b/piou-piou/ribs-cron-bundle/1.0/manifest.json similarity index 100% rename from piou-piou/ribs-cron-bundle/1.0.0/manifest.json rename to piou-piou/ribs-cron-bundle/1.0/manifest.json From 8e53df6d32c27c58f937ad48df207a48aa90b079 Mon Sep 17 00:00:00 2001 From: Piou-piou Date: Sat, 19 Oct 2019 10:49:14 +0200 Subject: [PATCH 3/7] Revert "[edit] RibsCronBundle version dir" This reverts commit 200de764 --- nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml b/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml index 30767e1e..4e684794 100644 --- a/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml +++ b/nelmio/api-doc-bundle/3.0/config/packages/nelmio_api_doc.yaml @@ -3,7 +3,7 @@ nelmio_api_doc: info: title: My App description: This is an awesome app! - version: 1.0 + version: 1.0.0 areas: # to filter documented areas path_patterns: - ^/api(?!/doc$) # Accepts routes under /api except /api/doc From 4f5b67785a4a791238343b3d2a25b851b28b63c9 Mon Sep 17 00:00:00 2001 From: Anthony Pilloud Date: Sat, 19 Oct 2019 11:18:14 +0200 Subject: [PATCH 4/7] [del] remove bad environment variables --- piou-piou/ribs-cron-bundle/1.0/manifest.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/piou-piou/ribs-cron-bundle/1.0/manifest.json b/piou-piou/ribs-cron-bundle/1.0/manifest.json index 12420d9c..3950b869 100644 --- a/piou-piou/ribs-cron-bundle/1.0/manifest.json +++ b/piou-piou/ribs-cron-bundle/1.0/manifest.json @@ -4,9 +4,5 @@ }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" - }, - "env": { - "IP_CRON_EXTERNAL": "", - "IP_CRON_INTERNAL": "127.0.0.1" } } From ce17ff8df61ca3ee307c7514ad147d3c2c595e89 Mon Sep 17 00:00:00 2001 From: Anthony Pilloud Date: Sat, 19 Oct 2019 11:20:00 +0200 Subject: [PATCH 5/7] [edit] ribs cron config file --- piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml b/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml index 2e38ee21..e0f2bebc 100644 --- a/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml +++ b/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml @@ -1,3 +1,6 @@ parameters: - data_directory: '%kernel.project_dir%/data/' - ribs_cron: + data_directory: '%kernel.project_dir%/data/' + ribs_cron_ip_external: + ribs_cron_ip_internal: "127.0.0.1" + ribs_cron: +# testCronCall: "* * * * *" From 023e0435b52aac26dc716bc4eba5246292099442 Mon Sep 17 00:00:00 2001 From: Anthony Pilloud Date: Sat, 19 Oct 2019 11:21:30 +0200 Subject: [PATCH 6/7] [fix] space in ribs_cron --- piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml b/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml index e0f2bebc..9374fc0f 100644 --- a/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml +++ b/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml @@ -1,6 +1,6 @@ parameters: - data_directory: '%kernel.project_dir%/data/' - ribs_cron_ip_external: - ribs_cron_ip_internal: "127.0.0.1" - ribs_cron: -# testCronCall: "* * * * *" + data_directory: '%kernel.project_dir%/data/' + ribs_cron_ip_external: + ribs_cron_ip_internal: "127.0.0.1" + ribs_cron: +# testCronCall: "* * * * *" From 1b3c1e772ffe2ea9da483c9bcee4e6ff5195e2c2 Mon Sep 17 00:00:00 2001 From: Piou-piou Date: Sat, 19 Oct 2019 20:05:02 +0200 Subject: [PATCH 7/7] [edit] environment variables to use them in yaml config file --- piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml | 6 +++--- piou-piou/ribs-cron-bundle/1.0/manifest.json | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml b/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml index 9374fc0f..1f11a49f 100644 --- a/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml +++ b/piou-piou/ribs-cron-bundle/1.0/config/ribs_cron.yaml @@ -1,6 +1,6 @@ parameters: data_directory: '%kernel.project_dir%/data/' - ribs_cron_ip_external: - ribs_cron_ip_internal: "127.0.0.1" + ribs_cron_ip_external: '%env(IP_CRON_EXTERNAL)%' + ribs_cron_ip_internal: '%env(IP_CRON_INTERNAL)%' ribs_cron: -# testCronCall: "* * * * *" +# testCronCall: '* * * * *' diff --git a/piou-piou/ribs-cron-bundle/1.0/manifest.json b/piou-piou/ribs-cron-bundle/1.0/manifest.json index 3950b869..12420d9c 100644 --- a/piou-piou/ribs-cron-bundle/1.0/manifest.json +++ b/piou-piou/ribs-cron-bundle/1.0/manifest.json @@ -4,5 +4,9 @@ }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" + }, + "env": { + "IP_CRON_EXTERNAL": "", + "IP_CRON_INTERNAL": "127.0.0.1" } }