From e9011d7e002390ec5e4829b48fe627eb1560333e Mon Sep 17 00:00:00 2001 From: Marcel Kallen Date: Tue, 14 Sep 2021 20:39:36 +0200 Subject: [PATCH 1/7] Added default config for saas-provider-bundle --- .../2.0/config/packages/saas_provider_bundle.yaml | 3 +++ fluxter/symfony-saas-provider-bundle/2.0/manifest.json | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 fluxter/symfony-saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml create mode 100644 fluxter/symfony-saas-provider-bundle/2.0/manifest.json diff --git a/fluxter/symfony-saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml b/fluxter/symfony-saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml new file mode 100644 index 00000000..b6c1fa3b --- /dev/null +++ b/fluxter/symfony-saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml @@ -0,0 +1,3 @@ +saas_provider: + client_entity: App\Entity\Tenant + global_url: app.yourdomain.tld \ No newline at end of file diff --git a/fluxter/symfony-saas-provider-bundle/2.0/manifest.json b/fluxter/symfony-saas-provider-bundle/2.0/manifest.json new file mode 100644 index 00000000..77f2e65b --- /dev/null +++ b/fluxter/symfony-saas-provider-bundle/2.0/manifest.json @@ -0,0 +1,8 @@ + { + "bundles": { + "Fluxter\\SaasProviderBundle\\SaasProviderBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} \ No newline at end of file From bb9d68c90022542254a960b5a0540ae71d504036 Mon Sep 17 00:00:00 2001 From: Marcel Kallen Date: Tue, 14 Sep 2021 20:43:20 +0200 Subject: [PATCH 2/7] moved to saas-provider-bundle and fixed yaml indention --- .../2.0/config/packages/saas_provider_bundle.yaml | 3 +++ .../2.0/manifest.json | 0 .../2.0/config/packages/saas_provider_bundle.yaml | 3 --- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml rename fluxter/{symfony-saas-provider-bundle => saas-provider-bundle}/2.0/manifest.json (100%) delete mode 100644 fluxter/symfony-saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml diff --git a/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml b/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml new file mode 100644 index 00000000..9fbaad39 --- /dev/null +++ b/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml @@ -0,0 +1,3 @@ +saas_provider: + client_entity: App\Entity\Tenant + global_url: app.yourdomain.tld \ No newline at end of file diff --git a/fluxter/symfony-saas-provider-bundle/2.0/manifest.json b/fluxter/saas-provider-bundle/2.0/manifest.json similarity index 100% rename from fluxter/symfony-saas-provider-bundle/2.0/manifest.json rename to fluxter/saas-provider-bundle/2.0/manifest.json diff --git a/fluxter/symfony-saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml b/fluxter/symfony-saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml deleted file mode 100644 index b6c1fa3b..00000000 --- a/fluxter/symfony-saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml +++ /dev/null @@ -1,3 +0,0 @@ -saas_provider: - client_entity: App\Entity\Tenant - global_url: app.yourdomain.tld \ No newline at end of file From 697a5e989df8efa2e45096aa102954cc61002d15 Mon Sep 17 00:00:00 2001 From: Marcel Kallen Date: Tue, 14 Sep 2021 20:44:27 +0200 Subject: [PATCH 3/7] adde new line! --- .../2.0/config/packages/saas_provider_bundle.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml b/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml index 9fbaad39..5a9f94c7 100644 --- a/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml +++ b/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml @@ -1,3 +1,3 @@ saas_provider: client_entity: App\Entity\Tenant - global_url: app.yourdomain.tld \ No newline at end of file + global_url: app.yourdomain.tld From 1eb4a356ae4f99a2c0e7722b73932a34e5cfe2a6 Mon Sep 17 00:00:00 2001 From: Marcel Kallen Date: Tue, 14 Sep 2021 20:49:41 +0200 Subject: [PATCH 4/7] manifest for 1.0 and dev-master --- .../1.0/config/packages/saas_provider_bundle.yaml | 4 ++++ fluxter/saas-provider-bundle/{2.0 => 1.0}/manifest.json | 4 ++-- .../config/packages/saas_provider_bundle.yaml | 0 fluxter/saas-provider-bundle/dev-master/manifest.json | 8 ++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 fluxter/saas-provider-bundle/1.0/config/packages/saas_provider_bundle.yaml rename fluxter/saas-provider-bundle/{2.0 => 1.0}/manifest.json (96%) rename fluxter/saas-provider-bundle/{2.0 => dev-master}/config/packages/saas_provider_bundle.yaml (100%) create mode 100644 fluxter/saas-provider-bundle/dev-master/manifest.json diff --git a/fluxter/saas-provider-bundle/1.0/config/packages/saas_provider_bundle.yaml b/fluxter/saas-provider-bundle/1.0/config/packages/saas_provider_bundle.yaml new file mode 100644 index 00000000..0a2eb9f8 --- /dev/null +++ b/fluxter/saas-provider-bundle/1.0/config/packages/saas_provider_bundle.yaml @@ -0,0 +1,4 @@ +saas_provider: + client_entity: App\Entity\Client + global_url: app.yourdomain.tld + apikey: "Your unused apikey" diff --git a/fluxter/saas-provider-bundle/2.0/manifest.json b/fluxter/saas-provider-bundle/1.0/manifest.json similarity index 96% rename from fluxter/saas-provider-bundle/2.0/manifest.json rename to fluxter/saas-provider-bundle/1.0/manifest.json index 77f2e65b..c7207383 100644 --- a/fluxter/saas-provider-bundle/2.0/manifest.json +++ b/fluxter/saas-provider-bundle/1.0/manifest.json @@ -1,8 +1,8 @@ - { +{ "bundles": { "Fluxter\\SaasProviderBundle\\SaasProviderBundle": ["all"] }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" } -} \ No newline at end of file +} diff --git a/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml b/fluxter/saas-provider-bundle/dev-master/config/packages/saas_provider_bundle.yaml similarity index 100% rename from fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml rename to fluxter/saas-provider-bundle/dev-master/config/packages/saas_provider_bundle.yaml diff --git a/fluxter/saas-provider-bundle/dev-master/manifest.json b/fluxter/saas-provider-bundle/dev-master/manifest.json new file mode 100644 index 00000000..c7207383 --- /dev/null +++ b/fluxter/saas-provider-bundle/dev-master/manifest.json @@ -0,0 +1,8 @@ +{ + "bundles": { + "Fluxter\\SaasProviderBundle\\SaasProviderBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} From 5048d172a47e78471c4706332f14bbf05dc98135 Mon Sep 17 00:00:00 2001 From: Marcel Kallen Date: Tue, 14 Sep 2021 21:00:15 +0200 Subject: [PATCH 5/7] removed dev-master --- .../dev-master/config/packages/saas_provider_bundle.yaml | 3 --- fluxter/saas-provider-bundle/dev-master/manifest.json | 8 -------- 2 files changed, 11 deletions(-) delete mode 100644 fluxter/saas-provider-bundle/dev-master/config/packages/saas_provider_bundle.yaml delete mode 100644 fluxter/saas-provider-bundle/dev-master/manifest.json diff --git a/fluxter/saas-provider-bundle/dev-master/config/packages/saas_provider_bundle.yaml b/fluxter/saas-provider-bundle/dev-master/config/packages/saas_provider_bundle.yaml deleted file mode 100644 index 5a9f94c7..00000000 --- a/fluxter/saas-provider-bundle/dev-master/config/packages/saas_provider_bundle.yaml +++ /dev/null @@ -1,3 +0,0 @@ -saas_provider: - client_entity: App\Entity\Tenant - global_url: app.yourdomain.tld diff --git a/fluxter/saas-provider-bundle/dev-master/manifest.json b/fluxter/saas-provider-bundle/dev-master/manifest.json deleted file mode 100644 index c7207383..00000000 --- a/fluxter/saas-provider-bundle/dev-master/manifest.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "bundles": { - "Fluxter\\SaasProviderBundle\\SaasProviderBundle": ["all"] - }, - "copy-from-recipe": { - "config/": "%CONFIG_DIR%/" - } -} From 754dfa01eb03054e06f16e4adfa31a89be7dd205 Mon Sep 17 00:00:00 2001 From: Marcel Kallen Date: Tue, 14 Sep 2021 22:12:41 +0200 Subject: [PATCH 6/7] moved to version 2.0 --- .../{1.0 => 2.0}/config/packages/saas_provider_bundle.yaml | 0 fluxter/saas-provider-bundle/{1.0 => 2.0}/manifest.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename fluxter/saas-provider-bundle/{1.0 => 2.0}/config/packages/saas_provider_bundle.yaml (100%) rename fluxter/saas-provider-bundle/{1.0 => 2.0}/manifest.json (100%) diff --git a/fluxter/saas-provider-bundle/1.0/config/packages/saas_provider_bundle.yaml b/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml similarity index 100% rename from fluxter/saas-provider-bundle/1.0/config/packages/saas_provider_bundle.yaml rename to fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml diff --git a/fluxter/saas-provider-bundle/1.0/manifest.json b/fluxter/saas-provider-bundle/2.0/manifest.json similarity index 100% rename from fluxter/saas-provider-bundle/1.0/manifest.json rename to fluxter/saas-provider-bundle/2.0/manifest.json From e6a23aed10cc0fe3026f5bb1fd4920e3c2537c14 Mon Sep 17 00:00:00 2001 From: Marcel Kallen Date: Tue, 14 Sep 2021 22:13:54 +0200 Subject: [PATCH 7/7] removed old option for apikey --- .../2.0/config/packages/saas_provider_bundle.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml b/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml index 0a2eb9f8..b5e6d3af 100644 --- a/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml +++ b/fluxter/saas-provider-bundle/2.0/config/packages/saas_provider_bundle.yaml @@ -1,4 +1,3 @@ saas_provider: client_entity: App\Entity\Client global_url: app.yourdomain.tld - apikey: "Your unused apikey"