From 43b57c40b2cd48c1b0d93135aa1f97453929c693 Mon Sep 17 00:00:00 2001 From: Kevin Auvinet Date: Thu, 18 Sep 2014 16:51:05 +0200 Subject: [PATCH 1/2] Fix issue #533 The given variable `data` is the `parameters.ini` content file. In the file `capifony / lib / symfony2 / database.rb` there is ```ruby data = capture("#{try_sudo} cat #{current_path}/#{app_config_path}/#{app_config_file}") config = load_database_config data, symfony_env_prod ``` --- lib/capifony_symfony2.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/capifony_symfony2.rb b/lib/capifony_symfony2.rb index 2c0efd8..4ac1e26 100755 --- a/lib/capifony_symfony2.rb +++ b/lib/capifony_symfony2.rb @@ -150,7 +150,7 @@ def load_database_config(data, env) def read_parameters(data) if '.ini' === File.extname(app_config_file) then - File.readable?(data) ? IniFile::load(data) : IniFile.new(data) + File.readable?(data) ? IniFile::load(data) : IniFile.new( :content => data ) else YAML::load(data) end From db491c011da728765ecd007e48ee3640d0239311 Mon Sep 17 00:00:00 2001 From: Kevin Auvinet Date: Mon, 22 Sep 2014 16:48:22 +0200 Subject: [PATCH 2/2] Replace "backups/" by "#{backup_path}/" Replace the hard coded path of the backup directory by the variable `#{backup_path}` --- lib/symfony2/shared.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/symfony2/shared.rb b/lib/symfony2/shared.rb index f5dfa41..559234e 100644 --- a/lib/symfony2/shared.rb +++ b/lib/symfony2/shared.rb @@ -12,18 +12,18 @@ run "#{try_sudo} sh -c 'cd #{shared_path}; tar -zcvf #{file} --exclude='cached-copy' .'" capifony_puts_ok - FileUtils.mkdir_p("backups/") + FileUtils.mkdir_p("#{backup_path}/") capifony_progress_start - get(file, "backups/#{filename}", :via => :scp) do |channel, name, sent, total| + get(file, "#{backup_path}/#{filename}", :via => :scp) do |channel, name, sent, total| capifony_progress_update(sent, total) end capifony_pretty_print "--> Cleaning up" begin - FileUtils.ln_sf(filename, "backups/#{application}.#{env}_shared.latest.tar.gz") + FileUtils.ln_sf(filename, "#{backup_path}/#{application}.#{env}_shared.latest.tar.gz") rescue Exception # fallback for file systems that don't support symlinks - FileUtils.cp_r("backups/#{filename}", "backups/#{application}.#{env}_shared.latest.tar.gz") + FileUtils.cp_r("#{backup_path}/#{filename}", "#{backup_path}/#{application}.#{env}_shared.latest.tar.gz") end run "#{try_sudo} rm -f #{file}" capifony_puts_ok