From f0b62e0e6e029a9ecb4884bf6861b4fd5ddd077e Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sun, 28 Jan 2018 22:57:29 +0100 Subject: [PATCH 1/7] Adding BackupManagerBundle --- .../2.0/config/packages/backup-manager.yaml | 14 ++++++++++++++ backup-manager/symfony/2.0/manifest.json | 11 +++++++++++ backup-manager/symfony/2.0/post-install.txt | 7 +++++++ 3 files changed, 32 insertions(+) create mode 100644 backup-manager/symfony/2.0/config/packages/backup-manager.yaml create mode 100644 backup-manager/symfony/2.0/manifest.json create mode 100644 backup-manager/symfony/2.0/post-install.txt diff --git a/backup-manager/symfony/2.0/config/packages/backup-manager.yaml b/backup-manager/symfony/2.0/config/packages/backup-manager.yaml new file mode 100644 index 00000000..3b57d969 --- /dev/null +++ b/backup-manager/symfony/2.0/config/packages/backup-manager.yaml @@ -0,0 +1,14 @@ +# See full config at https://github.com/backup-manager/symfony +bm_backup_manager: + database: + development: + type: mysql + host: '%env(BM_HOST)%' + port: 3306 + user: '%env(BM_USER)%' + pass: '%env(BM_PASS)%' + database: '%env(BM_DATABASE)%' + storage: + local: + type: Local + root: "%kernel.cache_dir%/db" diff --git a/backup-manager/symfony/2.0/manifest.json b/backup-manager/symfony/2.0/manifest.json new file mode 100644 index 00000000..f6a06f5d --- /dev/null +++ b/backup-manager/symfony/2.0/manifest.json @@ -0,0 +1,11 @@ +{ + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + }, + "env": { + "BM_HOST": "localhost", + "BM_USER": "root", + "BM_PASS": "", + "BM_DATABASE": "symfony" + } +} diff --git a/backup-manager/symfony/2.0/post-install.txt b/backup-manager/symfony/2.0/post-install.txt new file mode 100644 index 00000000..ec69cda2 --- /dev/null +++ b/backup-manager/symfony/2.0/post-install.txt @@ -0,0 +1,7 @@ + + What's next for Backup Manager Bundle? + + + * Configure your application: + 1. Make sure you have proper values in your .env file. + 2. Configure a good storage for your backups. See the documentation for all possible values. https://github.com/backup-manager/symfony From 8a54f81370188760174d243a6f71ce1483e1c881 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sun, 28 Jan 2018 23:00:41 +0100 Subject: [PATCH 2/7] Using underscore notation --- .../config/packages/{backup-manager.yaml => backup_manager.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename backup-manager/symfony/2.0/config/packages/{backup-manager.yaml => backup_manager.yaml} (100%) diff --git a/backup-manager/symfony/2.0/config/packages/backup-manager.yaml b/backup-manager/symfony/2.0/config/packages/backup_manager.yaml similarity index 100% rename from backup-manager/symfony/2.0/config/packages/backup-manager.yaml rename to backup-manager/symfony/2.0/config/packages/backup_manager.yaml From bdbde6c7f75d063c454aff98b7ab3247f2b93d85 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sun, 28 Jan 2018 23:03:10 +0100 Subject: [PATCH 3/7] Register the bundle --- backup-manager/symfony/2.0/manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backup-manager/symfony/2.0/manifest.json b/backup-manager/symfony/2.0/manifest.json index f6a06f5d..0e3c57ff 100644 --- a/backup-manager/symfony/2.0/manifest.json +++ b/backup-manager/symfony/2.0/manifest.json @@ -1,4 +1,7 @@ { + "bundles": { + "BM\\BackupManagerBundle\\BMBackupManagerBundle": ["all"] + }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" }, From cf410c2e53dbe7d3cac07b3acdb02eecb974d739 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 3 Mar 2018 13:28:24 +0100 Subject: [PATCH 4/7] Use DSN to configure database --- .../{2.0 => 2.1}/config/packages/backup_manager.yaml | 7 +------ backup-manager/symfony/{2.0 => 2.1}/manifest.json | 5 +---- backup-manager/symfony/{2.0 => 2.1}/post-install.txt | 0 3 files changed, 2 insertions(+), 10 deletions(-) rename backup-manager/symfony/{2.0 => 2.1}/config/packages/backup_manager.yaml (51%) rename backup-manager/symfony/{2.0 => 2.1}/manifest.json (61%) rename backup-manager/symfony/{2.0 => 2.1}/post-install.txt (100%) diff --git a/backup-manager/symfony/2.0/config/packages/backup_manager.yaml b/backup-manager/symfony/2.1/config/packages/backup_manager.yaml similarity index 51% rename from backup-manager/symfony/2.0/config/packages/backup_manager.yaml rename to backup-manager/symfony/2.1/config/packages/backup_manager.yaml index 3b57d969..3bef9731 100644 --- a/backup-manager/symfony/2.0/config/packages/backup_manager.yaml +++ b/backup-manager/symfony/2.1/config/packages/backup_manager.yaml @@ -2,12 +2,7 @@ bm_backup_manager: database: development: - type: mysql - host: '%env(BM_HOST)%' - port: 3306 - user: '%env(BM_USER)%' - pass: '%env(BM_PASS)%' - database: '%env(BM_DATABASE)%' + dsn: '%env(mysql://db_user:db_password@127.0.0.1:3306/db_name)%' storage: local: type: Local diff --git a/backup-manager/symfony/2.0/manifest.json b/backup-manager/symfony/2.1/manifest.json similarity index 61% rename from backup-manager/symfony/2.0/manifest.json rename to backup-manager/symfony/2.1/manifest.json index 0e3c57ff..3a77fe2a 100644 --- a/backup-manager/symfony/2.0/manifest.json +++ b/backup-manager/symfony/2.1/manifest.json @@ -6,9 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "env": { - "BM_HOST": "localhost", - "BM_USER": "root", - "BM_PASS": "", - "BM_DATABASE": "symfony" + "DATABASE_URL": "mysql://db_user:db_password@127.0.0.1:3306/db_name" } } diff --git a/backup-manager/symfony/2.0/post-install.txt b/backup-manager/symfony/2.1/post-install.txt similarity index 100% rename from backup-manager/symfony/2.0/post-install.txt rename to backup-manager/symfony/2.1/post-install.txt From 3e0121721ce503d43b76be659e484bd4403a8e56 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 3 Mar 2018 13:28:59 +0100 Subject: [PATCH 5/7] oops, copy-paste error --- backup-manager/symfony/2.1/config/packages/backup_manager.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backup-manager/symfony/2.1/config/packages/backup_manager.yaml b/backup-manager/symfony/2.1/config/packages/backup_manager.yaml index 3bef9731..d466fd73 100644 --- a/backup-manager/symfony/2.1/config/packages/backup_manager.yaml +++ b/backup-manager/symfony/2.1/config/packages/backup_manager.yaml @@ -2,7 +2,7 @@ bm_backup_manager: database: development: - dsn: '%env(mysql://db_user:db_password@127.0.0.1:3306/db_name)%' + dsn: '%env(DATABASE_URL)%' storage: local: type: Local From 85f2ffe1c557abde99c088c97ae93350a5dbcab9 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sun, 4 Mar 2018 11:54:40 +0100 Subject: [PATCH 6/7] Minor fixes --- .../packages/{backup_manager.yaml => bm_backup_manager.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename backup-manager/symfony/2.1/config/packages/{backup_manager.yaml => bm_backup_manager.yaml} (83%) diff --git a/backup-manager/symfony/2.1/config/packages/backup_manager.yaml b/backup-manager/symfony/2.1/config/packages/bm_backup_manager.yaml similarity index 83% rename from backup-manager/symfony/2.1/config/packages/backup_manager.yaml rename to backup-manager/symfony/2.1/config/packages/bm_backup_manager.yaml index d466fd73..306e0326 100644 --- a/backup-manager/symfony/2.1/config/packages/backup_manager.yaml +++ b/backup-manager/symfony/2.1/config/packages/bm_backup_manager.yaml @@ -6,4 +6,4 @@ bm_backup_manager: storage: local: type: Local - root: "%kernel.cache_dir%/db" + root: '%kernel.cache_dir%/db' From aca4c5dfe520e5c50bffa297dbb3ec054deeb052 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Mon, 5 Mar 2018 19:59:36 +0100 Subject: [PATCH 7/7] Bugfix --- .../symfony/2.1/config/packages/bm_backup_manager.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backup-manager/symfony/2.1/config/packages/bm_backup_manager.yaml b/backup-manager/symfony/2.1/config/packages/bm_backup_manager.yaml index 306e0326..8d397e3b 100644 --- a/backup-manager/symfony/2.1/config/packages/bm_backup_manager.yaml +++ b/backup-manager/symfony/2.1/config/packages/bm_backup_manager.yaml @@ -2,7 +2,7 @@ bm_backup_manager: database: development: - dsn: '%env(DATABASE_URL)%' + dsn: '%env(resolve:DATABASE_URL)%' storage: local: type: Local