capistrano-typo3 0.2.4 → 0.3.4

data/lib/capistrano/tasks/typo3.cap

@@ -2,14 +2,23 @@
 
 #----- DEFAULT SETTINGS, OVERRIDE WHEN NEEDED
 
+set :debug, 0
 set :git_no_cache, 0
 set :restart_webserver, "sudo /etc/init.d/apache2 restart"
 set :bundle_executable, "/usr/bin/bundle"
 set :rake_executable, "./bin/rake"
 set :rake_mysql_exec_dir, "/usr/bin"
 set :rake_php_executable, "/usr/bin/php"
+
 set :t3_dont_upgrade_source, 0
 set :t3_alternative_source_url, nil
+set :t3_main_version, '7.6'
+set :t3_post_deployment_commands, []
+set :t3_db_sync_ignore_tables, []
+
+
+set :typo3_v6_local_conf_path, File.join('current','dummy','typo3conf','LocalConfiguration.php')
+set :http_protocol, 'http'
 
 #----- INTERNAL VARIABLES, DON'T CHANGE OR OVERRIDE THESE
 set :hooks_before_suite_run, 0
@@ -17,266 +26,345 @@ set :install_or_update_rake_typo3_run, 0
 
 namespace :typo3 do
 
-  # Empty repository must exist in git remote.
-  # This creates useable fresh skeleton for TYPO3
-  #
-  # From here:
-  # - a new TYPO3 enviroment can be created
-  # - an existing TYPO3 environment can be imported in this module
-  desc "init a initial dev environment"
-  task :init1_empty_dummy do
-
-    invoke 'typo3:helper:rm_deploy_to'
-    invoke 'typo3:hooks:before_suite'
-
-    invoke 'deploy:check'
-    invoke 'deploy:updating'
-    invoke 'typo3:helper:setup_shared_typo3_dirs'
-    invoke 'typo3:helper:current_relative_symlink'
-
-    on roles(:all) do
-      execute "cd #{fetch(:deploy_to)}/current/ && git remote set-url origin #{fetch(:repo_url)}"
-      execute "cd #{fetch(:deploy_to)}/current/ && mkdir -p deploy/patches"
-      execute "cd #{fetch(:deploy_to)}/current/ && touch deploy/patches/.keep"
-      execute "cd #{fetch(:deploy_to)}/current/ && mkdir -p deploy/migrations"
-      execute "cd #{fetch(:deploy_to)}/current/ && touch deploy/migrations/.keep"
-      execute "cd #{fetch(:deploy_to)}/current/ && mkdir -p dummy/typo3conf/ext"
-      execute "cd #{fetch(:deploy_to)}/current/ && touch dummy/typo3conf/ext/index.html"
-    end
-
-    invoke 'typo3:helper:create_gitignore'
-    invoke 'typo3:helper:upgrade_source'
-    print "initial environment has been setup"
-  end
-
-  #  desc "init step 2: install a fresh TYPO3 in the designated version"
-  task :init2_install_typo3 do
-    print "SORRY NOT YET IMPLEMENTED"
-  end
-
-  desc "init step 2: clone from extisting TYPO3 environment"
-  task :init2_install_typo3 do
-
-    print "\nNOTE: When this task fails most times there is a problem with your ssh authorized public keys\n\n"
+  desc "Setup a new production environment. Don't sync content from old production"
+  task :setup_new_stage_no_sync do
+    invoke 'typo3:helper:rm_deploy_to' #OKE
+    invoke 'deploy' #OKE
+    invoke 'typo3:helper:setup_shared_typo3_dirs' #OKE
+    invoke 'typo3:helper:update_localconf' #OKE
+    invoke 'typo3:helper:current_relative_symlink' #OKE
+    invoke 'typo3:helper:restart_webserver' #OKE
 
-    invoke 'typo3:hooks:before_suite'
-    invoke 'typo3:sync_from_production'
-
-    on roles(:all) do
-
-      execute "rsync -v #{fetch(:t3_clone_original)[:ssh_user]}@#{fetch(:t3_clone_original)[:ssh_host]}:#{fetch(:t3_clone_original)[:dummy_root]}/* #{fetch(:deploy_to)}/current/dummy/"
-      execute "rsync -v #{fetch(:t3_clone_original)[:ssh_user]}@#{fetch(:t3_clone_original)[:ssh_host]}:#{fetch(:t3_clone_original)[:dummy_root]}/.* #{fetch(:deploy_to)}/current/dummy/"
-      execute "rsync -av --exclude ext --exclude *.log --exclude temp*  #{fetch(:t3_clone_original)[:ssh_user]}@#{fetch(:t3_clone_original)[:ssh_host]}:#{fetch(:t3_clone_original)[:dummy_root]}/typo3conf/ #{fetch(:deploy_to)}/current/dummy/typo3conf/"
-      execute "rsync -avL  #{fetch(:t3_clone_original)[:ssh_user]}@#{fetch(:t3_clone_original)[:ssh_host]}:#{fetch(:t3_clone_original)[:dummy_root]}/typo3conf/ext/ #{fetch(:deploy_to)}/current/dummy/typo3conf/ext/"
-
-      #TODO do git module magic
-      #execute "cd #{fetch(:deploy_to)}/current && find `dummy/typo3conf/ext -name '.git'`"
-    end
-
-    invoke 'typo3:hooks:after_suite'
-  end
-
-  desc "Setup a new production environment. Manually sync content from old production"
-  task :init3_setup_new_stage_no_sync do
-    invoke 'typo3:helper:rm_deploy_to'
-    invoke 'typo3:hooks:before_suite'
-    invoke 'typo3:helper:setup_shared_typo3_dirs'
-    invoke 'deploy'
-    invoke('typo3:hooks:after_suite') #FIXME Only run it init3_setup_new_stage_no_sync is called
     print "environment has been setup, you do need to sync content from old production"
   end
 
   desc "Setup a new staged typo3 environment when a it's already in model"
-  task :init3_setup_new_stage_sync do
-    invoke 'typo3:helper:rm_deploy_to'
-    invoke 'typo3:hooks:before_suite'
-    invoke 'typo3:helper:setup_shared_typo3_dirs'
-    invoke 'deploy'
-    invoke 'typo3:sync_from_production' # SAME BUT THIS ONE
-    invoke('typo3:hooks:after_suite')
+  task :setup_new_stage_sync do
+
+    invoke 'typo3:helper:rm_deploy_to' #OKE
+    invoke 'deploy' #OKE
+    invoke 'typo3:helper:setup_shared_typo3_dirs' #OKE
+
+    invoke 'typo3:content:sync_files_from_production' #OKE
+    invoke 'typo3:content:sync_db_from_production' #OKE
+    invoke 'typo3:content:flush_cache_in_db' #OKE
+    invoke 'typo3:helper:update_localconf' #OKE
+    invoke 'typo3:helper:current_relative_symlink' #OKE
+    invoke 'typo3:helper:restart_webserver' #OKE
   end
 
-  desc 'merge with [remote_branch]'
-  task :merge_with, :remotebranch do |t, args|
-
-    invoke 'typo3:hooks:before_suite'
+  desc "sync db & files and then deploy. Typically for Continuous Integration"
+  task :sync_n_deploy do
     invoke 'deploy'
-
-    on roles(:all) do
-      branch = args[:remotebranch]
-      execute "cd #{fetch(:deploy_to)}/current && git remote set-url origin #{fetch(:repo_url)}"
-      execute "cd #{fetch(:deploy_to)}/current && git stash"
-      execute "cd #{fetch(:deploy_to)}/current && git fetch"
-      execute "cd #{fetch(:deploy_to)}/current && git checkout #{branch}"
-      execute "cd #{fetch(:deploy_to)}/current && git checkout master"
-      execute "cd #{fetch(:deploy_to)}/current && git merge --strategy-option ours #{branch}"
-    end
-
-    invoke('typo3:hooks:after_suite')
+    invoke 'typo3:content:sync_files_from_production'
+    invoke 'typo3:content:sync_db_from_production'
+    invoke 'typo3:content:flush_cache_in_db'
+    invoke 'typo3:helper:update_localconf'
+    invoke 'typo3:helper:current_relative_symlink'
+    invoke 'typo3:helper:restart_webserver'
   end
 
   desc "deploy the typo3 way"
   task :deploy do
-    invoke 'typo3:hooks:before_suite'
     invoke 'deploy'
-    invoke('typo3:hooks:after_suite')
+    invoke 'typo3:helper:update_localconf'
+    invoke 'typo3:helper:current_relative_symlink'
+    invoke 'typo3:helper:restart_webserver'
   end
 
-  desc "sync db & files and then deploy. Typically for Continuous Integration"
-  task :sync_n_deploy do
-    invoke 'typo3:hooks:before_suite'
-    invoke 'typo3:sync_from_production'
-    invoke 'deploy'
-    invoke('typo3:hooks:after_suite')
+  desc "Make db & files in env. identical to production"
+  task :sync_from_production do
+    invoke 'typo3:content:sync_files_from_production'
+    invoke 'typo3:content:sync_db_from_production'
+    invoke 'typo3:content:flush_cache_in_db'
   end
 
-  desc "Clear all db and file content and config cache"
-  task :clear_all_cache do
-    invoke 'typo3:helper:flush_content_cache'
-    on roles(:all) do
-      execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} env:flush_cache"
+  namespace :hooks do
+    task :after_deploy do
+        invoke 'git:set_remote_url_no_cache'
+        invoke 'typo3:helper:execute_post_deployment_commands'
     end
   end
 
-  #  desc "Run site presuite rspecs"
-  task :rspec_pre_suite do
-    on roles(:all) do
-      execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} env:rspec_pre_suite"
+  namespace :content do
+    desc 'sync files from production'
+    task :sync_files_from_production do
+      on roles(:allow_syncfiles) do
+        if fetch(:t3_live_sync)['filesync']
+          fetch(:t3_live_sync)['filesync'].each do |key,command|
+            execute "cd #{fetch(:deploy_to)} && #{command}"
+          end
+        end
+      end
     end
-  end
 
-  # desc "Run site post browser rspecs"
-  task :rspec_post_browser do
-    on roles(:all) do
-      execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} env:rspec_post_browser"
-    end
-  end
+    desc 'sync database from production and run sql updates'
+    task :sync_db_from_production do
+      on roles(:allow_syncdatabase) do
 
-  desc "Make db & files in env. identical to production"
-  task :sync_from_production do
-    invoke 'typo3:hooks:before_suite'
-    invoke 'typo3:helper:sync_files_from_production'
-    invoke 'typo3:helper:sync_db_from_production'
-    invoke 'typo3:helper:flush_content_cache'
-  end
+        ignorestring = ""
 
-  desc "Show environment information"
-  task :info do
-    invoke 'typo3:hooks:before_suite'
-    on roles(:all) do
-      execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} env:info"
-    end
-  end
+        if(:t3_db_sync_ignore_tables)
 
-  # Suite are large combined tasks like init3_setup_new_stage_sync
-  # Suite hooks are run only one time per session
-  namespace :hooks do
+          fetch(:t3_db_sync_ignore_tables).each do | ignore_tbl |
+            ignorestring = "#{ignorestring} --ignore-table=#{fetch(:t3_live_sync)['dbsync']['dbname']}.#{ignore_tbl}"
+          end
+        end
 
-    task :before_suite do
-      if(fetch(:hooks_before_suite_run)==0)
+        # DUMP DATABASE TO IMAGE
+        execute <<DBSYNC1
+          ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
+          'mysqldump -u#{fetch(:t3_live_sync)['dbsync']['dbuser']} \
+          -h#{fetch(:t3_live_sync)['dbsync']['dbhost']} \
+          -p#{fetch(:t3_live_sync)['dbsync']['dbpass']} \
+          #{ignorestring} \
+          #{fetch(:t3_live_sync)['dbsync']['dbname']} > /tmp/.captypo3dump-#{fetch(:t3_live_sync)['dbsync']['dbname']}'
+DBSYNC1
+
+        if(:t3_db_sync_ignore_tables)
+          fetch(:t3_db_sync_ignore_tables).each do | ignore_tbl |
+
+            execute <<DBSYNC1
+          ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
+          'mysqldump -u#{fetch(:t3_live_sync)['dbsync']['dbuser']} \
+          -h#{fetch(:t3_live_sync)['dbsync']['dbhost']} \
+          -p#{fetch(:t3_live_sync)['dbsync']['dbpass']} \
+          --no-data \
+            #{fetch(:t3_live_sync)['dbsync']['dbname']} #{ignore_tbl} >> /tmp/.captypo3dump-#{fetch(:t3_live_sync)['dbsync']['dbname']}'
+DBSYNC1
+          end
+        end
 
-        set :hooks_before_suite_run, 1
-        invoke 'typo3:helper:install_or_update_rake_typo3'
-        invoke 'typo3:helper:create_typo3yaml'
-        invoke 'typo3:helper:set_stage'
+        # COMPRESS IMAGE
+        execute <<DBSYNC2
+          ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
+          'gzip -f /tmp/.captypo3dump-#{fetch(:t3_live_sync)['dbsync']['dbname']}'
+DBSYNC2
+
+        # TRANSFER IMAGE
+        execute <<DBSYNC3
+          scp #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']}:/tmp/.captypo3dump-#{fetch(:t3_live_sync)['dbsync']['dbname']}.gz \
+          /tmp/.captypo3dump-#{fetch(:t3_live_sync)['dbsync']['dbname']}.gz
+DBSYNC3
+
+        # DECOMPRESS IMAGE
+        execute <<DBSYNC4
+          gunzip -f /tmp/.captypo3dump-#{fetch(:t3_live_sync)['dbsync']['dbname']}.gz
+DBSYNC4
+
+        # IMPORT AND REMOVE IMAGE
+        execute <<DBSYNC5
+          mysql -u#{fetch(:dbuser)} -h#{fetch(:dbhost)} -p#{fetch(:dbpass)} #{fetch(:dbname)} < /tmp/.captypo3dump-#{fetch(:t3_live_sync)['dbsync']['dbname']} && \
+          rm -f /tmp/.captypo3dump-#{fetch(:t3_live_sync)['dbsync']['dbname']}
+DBSYNC5
+
+        # REMOVE IMAGE
+        execute <<DBSYNC6
+          ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
+          'rm -f /tmp/.captypo3dump-#{fetch(:t3_live_sync)['dbsync']['dbname']}.gz'
+DBSYNC6
       end
+
+      invoke 'typo3:content:sql_updates'
     end
 
-    task :after_deploy do
-        invoke 'git:set_remote_url_no_cache'
+    desc 'run necessary sql queries for environment'
+    task :sql_updates do
+      on roles(:allow_syncdatabase) do
+        if fetch(:t3_sql_updates)
+          fetch(:t3_sql_updates).each do |command|
+            execute DT3MySQL::mysql_execute(command)
+          end
+        end
+      end
     end
 
-    task :after_suite do
-      invoke 'typo3:helper:run_filesearchandreplace'
-      invoke 'typo3:helper:update_localconf'
-      invoke 'typo3:helper:upgrade_source'
-      invoke 'typo3:helper:db_em_migrations'
-      invoke 'typo3:helper:run_migrations'
-      invoke 'typo3:helper:current_relative_symlink'
-      invoke 'typo3:helper:restart_webserver'
+    desc 'flush cache and session tables in database'
+    task :flush_cache_in_db do
+      on roles(:all) do
+
+        all_current_tables = capture(DT3MySQL::show_tables).split("\n")
+
+        cache_tables= %w(cache_extensions cache_hash cache_imagesizes cache_md5params cache_pages cache_pagesection cache_sys_dmail_stat cache_treelist cache_typo3temp_log cachingframework_cache_hash cachingframework_cache_hash_tags cachingframework_cache_pages cachingframework_cache_pages_tags cachingframework_cache_pagesection cachingframework_cache_pagesection_tags cf_cache_hash cf_cache_hash_tags cf_cache_pages cf_cache_pages_tags cf_cache_pagesection cf_cache_pagesection_tags cf_extbase_object cf_extbase_object_tags cf_extbase_reflection cf_extbase_reflection_tags cf_tt_news_cache cf_tt_news_cache_tags cf_tx_solr cf_tx_solr_tags tt_news_cache tt_news_cache_tags tx_realurl_chashcache tx_realurl_errorlog tx_realurl_pathcache tx_realurl_uniqalias tx_realurl_urldecodecache tx_realurl_urlencodecache tx_solr_cache tx_solr_cache_tags)
+
+        cache_tables.each do |table|
+          if all_current_tables.include?(table)
+            execute DT3MySQL::truncate_table(table)
+          end
+        end
+
+        session_tables=%w(be_sessions fe_session_data fe_sessions)
+        session_tables.each do |table|
+          if all_current_tables.include?(table)
+            execute DT3MySQL::truncate_table(table)
+          end
+        end
+      end
     end
   end
 
-  namespace :helper do
+  namespace :vagrant do
+    desc "when homestead is not yet configured"
+    task "init_homestead_conf" do
+      invoke 'typo3:vagrant:check_branch'
+      sh "mkdir -p config"
+      sh "cd config && curl -O https://raw.githubusercontent.com/t3labcom/capistrano-typo3/master/homestead_files/vagrant.yml"
+      sh "cd config/deploy && curl -O https://raw.githubusercontent.com/t3labcom/capistrano-typo3/master/homestead_files/homestead.rb"
+      sh "curl -O https://raw.githubusercontent.com/t3labcom/capistrano-typo3/master/homestead_files/Vagrantfile"
+    end
 
-    task :sync_files_from_production do
-      on roles(:devtest,:syncfiles) do
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:sync_files_from_production"
+    desc "setup new homestead vagrant machine for TYPO3 development"
+    task "setup_machine" do
+      invoke 'typo3:vagrant:check_branch'
+
+      if `vagrant status | grep running`.strip != ""
+        sh "vagrant destroy"
       end
-    end
 
-    task :sync_db_from_production do
-      on roles(:devtest,:syncdb) do
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:sync_db_from_production"
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:run_sql_updates"
+      sh "rm -f local.typo3.org"
+      sh "rm -Rf .vagrant"
+
+      if `vagrant plugin list | grep vagrant-bind`.include? 'vagrant-bindfs'
+        print "vagrant bindfs plugin is already installed\n"
+      else
+        sh "vagrant plugin install vagrant-bindfs"
       end
-    end
 
-    # Truncate tables with content cache
-    task :flush_content_cache do
+      sh "vagrant up"
+
       on roles(:all) do
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} env:truncate_cache_tables"
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} env:truncate_session_tables"
+        execute "sudo aptitude update"
+        execute "sudo aptitude install ruby-dev make -y"
+        execute "sudo gem install bundler"
       end
+
+      invoke 'typo3:vagrant:set_no_site'
+      invoke 'typo3:helper:restart_webserver'
     end
 
-    # remove deploy_to directory
-    task :rm_deploy_to do
+    desc "setup homestead"
+    task "setup_site" do
+      invoke 'typo3:vagrant:check_branch'
+
       on roles(:all) do
-        execute "rm -Rf #{fetch(:deploy_to)}"
+        ## PURGE IF NEEDED
+        execute "sudo rm -Rf /var/shared/fileadmin /var/shared/typo3temp /var/shared/uploads"
+        execute "sudo rm -f /var/current"
+        execute "sudo mysql -e 'DROP DATABASE IF EXISTS #{fetch(:dbname)}'"
+
+        ## CREATE
+        execute "sudo mkdir -p /var/shared/fileadmin /var/shared/typo3temp /var/shared/uploads"
+        execute "sudo chown -Rf vagrant.vagrant /var/shared/fileadmin /var/shared/typo3temp /var/shared/uploads"
+        execute "sudo ln -s /var/www/local.typo3.org /var/current"
       end
-    end
 
-    # TODO move to typo3-rake?
-    # create typo3 dirs in shared
-    task :setup_shared_typo3_dirs do
       on roles(:all) do
-        execute "cd #{fetch(:deploy_to)} && mkdir -p shared/fileadmin shared/typo3temp shared/uploads"
+        execute "sudo mysqladmin create #{fetch(:dbname)}"
       end
-    end
 
-    # set stage
-    task :set_stage do
+      invoke 'typo3:vagrant:fixknownhosts'
+      invoke 'typo3:content:sync_db_from_production'
+      invoke 'typo3:content:flush_cache_in_db'
+      invoke 'typo3:helper:update_localconf'
+
       on roles(:all) do
-        execute "echo '#{fetch(:stage).to_s}' > #{fetch(:deploy_to)}/STAGE"
+        if fetch(:hs_default_upstream_php_engine)
+          execute "sudo sed -i 's/set $upstream .*/set $upstream #{fetch(:hs_default_upstream_php_engine)};/g' /etc/nginx/sites-available/local.typo3.org.conf"
+        end
+        execute "sudo sed -i 's/root .*/root \"\\/var\\/www\\/local\\.typo3\\.org\\/dummy\\/\";/g' /etc/nginx/sites-available/local.typo3.org.conf"
       end
+
+      invoke 'typo3:helper:restart_webserver'
+      invoke 'typo3:content:sync_files_from_production'
+
+      print <<MSG
+
+    ----------------------------------------------------------------------
+    The website seems to be succesfully installed in the Homestead Vagrant
+    machine.
+
+    Open the site at http://local.typo3.org"
+
+    And live edit the website via the shortcut local.typo3.org in this
+    directory
+    ----------------------------------------------------------------------
+MSG
+    end
+
+    desc "purge .vagrant files"
+    task "purge_machine" do
+      print "OBSOLETE: you can run 'setup_machine' over and over again\n"
     end
 
-    # install rake-typo3 from github
-    task :install_or_update_rake_typo3 do
+    #desc "purge homestead site and database"
+    task "purge_site" do
+      print "OBSOLETE: you can run 'setup_site' over and over again\n"
+    end
 
-      if(fetch(:install_or_update_rake_typo3_run)==0)
+    task "check_branch" do
+      current_branch = `git branch | grep \\* | cut -d ' ' -f2`.strip
+      if current_branch != fetch(:branch)
+        raise "current branch differs from homestead.rb configuration.\n see config/deploy/homestead.rb\n\n Current branch:   #{current_branch}\n Homestead branch: #{fetch(:branch)} "
+      end
+    end
+
+    task "fixknownhosts" do
+      on roles(:all) do
+        execute "ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} uptime"
+      end
+    end
 
-        on roles(:all) do
+    task "set_no_site" do
+      on roles(:all) do
+        execute "sudo sed -i 's/root .*/root \"\\/var\\/\";/g' /etc/nginx/sites-available/local.typo3.org.conf"
+        execute "sudo su -c 'echo \"THERE IS NO DIRECTORY local.typo3.org  ... YOU MAY WANT TO RUN cap homstead:setup_site\" > /var/index.php'"
+      end
+    end
+  end
 
-          gitexist = capture "if [ -e '#{fetch(:deploy_to)}/.git/config' ]; then echo -n 'true'; fi"
+  namespace :test do
 
-          if(gitexist.chomp=='true')
+    desc "ssh_password_less_login_rsync"
+    task :ssh_password_less_login_rsync do
+      on roles(:all) do |server|
+        begin
+          capture("ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} uptime")
+        rescue
+           er =   "password less login to #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} is not possible\n"
+           er += "You need to fix this first.\n"
+           er += "solution 1: ssh-add.\n"
+           er += "solution 2: install public key on the remote server.\n"
 
-            #remove old deployTYPO3 version
-            remote = capture "cd #{fetch(:deploy_to)} && git remote -v"
-            if remote.include?('deploy')
-              print "removing old repository"
-              execute "cd  #{fetch(:deploy_to)} && rm -Rf .bundle config docs lib log spec .gitignore .rspec .travis.yml CHANGELOG.md Gemfile Gemfile.lock README.md Rakefile.rb VERSION .git"
-              execute "git clone https://github.com/Lingewoud/rake-typo3.git #{fetch(:deploy_to)}/.clone"
-              execute "cd #{fetch(:deploy_to)}/.clone && mv ./* ../"
-              execute "cd #{fetch(:deploy_to)}/.clone && mv .bundle .git .gitignore .rspec .travis.yml ../"
-            end
+           raise "#{er}"
+        end
+      end
+    end
+  end
 
-            execute "cd #{fetch(:deploy_to)} && git pull"
-            execute "cd #{fetch(:deploy_to)} && #{fetch(:bundle_executable)} install --binstubs"
+  namespace :helper do
+    task :execute_post_deployment_commands do
+      on roles(:all) do
 
-          else
-            execute "rm -Rf #{fetch(:deploy_to)}"
-            execute "git clone https://github.com/Lingewoud/rake-typo3.git #{fetch(:deploy_to)}"
-            execute "cd #{fetch(:deploy_to)} && #{fetch(:bundle_executable)} install --binstubs"
-            print "rake-typo3 has been installed"
+        if fetch(:t3_post_deployment_commands)
+          fetch(:t3_post_deployment_commands).each do |command|
+            execute command
           end
+        end
+      end
 
-          set :install_or_update_rake_typo3_run, 1
+    end #ENDTASK
 
-        end
+    # remove deploy_to directory
+    task :rm_deploy_to do
+      on roles(:all) do
+        execute "rm -Rf #{fetch(:deploy_to)}"
+      end
+    end
 
+    # create typo3 dirs in shared
+    task :setup_shared_typo3_dirs do
+      on roles(:all) do
+        execute "cd #{fetch(:deploy_to)} && mkdir -p shared/fileadmin shared/typo3temp shared/uploads"
       end
     end
 
@@ -290,116 +378,48 @@ namespace :typo3 do
 *.swp
 *.swo
 ENABLE_INSTALL_TOOL
-VERSION
+/VERSION
 temp_CACHE*.php
 deprecation_*.log
 "
-
         contents = StringIO.new(ignorestring)
         upload! contents, "#{fetch(:deploy_to)}/current/.gitignore"
       end
     end
 
-    task :create_typo3yaml do
-
-      on roles(:all) do
-
-        if(fetch(:t3_main_version))
-          t3yaml = {}
-          t3yaml['all'] = {}
-          t3yaml['all']['TYPO3_MAIN_VERSION'] = fetch(:t3_main_version)
-          t3yaml['all']['SYNCLIVE'] = {}
-          t3yaml['all']['SYNCLIVE']['SYNCCMDS'] = fetch(:t3_live_sync)['filesync']
-          t3yaml['all']['SYNCLIVE']['SSH_DB_SERVER'] = fetch(:t3_live_sync)['dbsync']['ssh_server']
-          t3yaml['all']['SYNCLIVE']['SSH_DB_USER'] = fetch(:t3_live_sync)['dbsync']['ssh_user']
-          t3yaml['all']['SYNCLIVE']['DB'] = fetch(:t3_live_sync)['dbsync']
-          t3yaml['all']['MYSQLEXECDIR'] = fetch(:rake_mysql_exec_dir)
-          t3yaml['all']['PHP_EXECUTABLE'] = fetch(:rake_php_executable)
-
-          stage = fetch(:stage).to_s
-
-          t3yaml[stage] = {}
-          t3yaml[stage]['DB'] = {}
-          t3yaml[stage]['DB']['dbname'] = fetch(:dbname)
-          t3yaml[stage]['DB']['dbuser'] = fetch(:dbuser)
-          t3yaml[stage]['DB']['dbpass'] = fetch(:dbpass)
-          t3yaml[stage]['DB']['dbhost'] = fetch(:dbhost)
-
-          t3yaml[stage]['SQL_UPDATES'] = fetch(:t3_sql_updates)
-          t3yaml[stage]['TYPO3_CONF_VARS'] = fetch(:t3_conf_vars)
-          t3yaml[stage]['TYPO3_CONF_VARS_EXT_EXTCONF'] = fetch(:t3_conf_vars_ext_extconf)
-          t3yaml[stage]['TYPO3_SOURCE_PATCHES'] = fetch(:t3_source_patches)
-
-          if !fetch(:t3_alternative_source_url).nil?
-            t3yaml[stage]['TYPO3_ALTERNATIVE_SOURCE_URL'] = fetch(:t3_alternative_source_url)
-          end
-
-
-          t3yaml[stage]['DISABLE_EXTENSIONS'] = fetch(:t3_disable_extensions)
-          t3yaml[stage]['FILE_SEARCH_REPLACE'] = fetch(:t3_file_search_replace)
-
-          contents = StringIO.new(t3yaml.to_yaml)
-          upload! contents, "#{fetch(:deploy_to)}/typo3.yml"
-        end
-
-      end
-    end
-
     # when not in deploy latest ls releases/ -1 | sort -r | head -n 1
     task :current_relative_symlink do
       on roles(:all) do
-        execute "rm -f #{current_path}"
-        execute "cd #{fetch(:deploy_to)} && ln -s releases/#{File.basename release_path} current"
+        execute "cd #{fetch(:deploy_to)} && rm -f current"
+        execute "cd #{fetch(:deploy_to)} && ln -s releases/`ls -1 releases/ | sort -r | head -n 1` current"
       end
     end
 
+    desc "update LocalConf with correct db credentionals"
     task :update_localconf do
-      on roles(:all) do
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:update_localconf_db_credentials"
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:update_localconf_typo3conf_vars"
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:update_localconf_disable_extensions"
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:update_localconf_extconf_settings"
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:flush_config_cache"
-      end
-    end
-
-    # Migrate database (typo3 Extension Manager migrations)
-    task :db_em_migrations do
-      on roles(:all) do
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:db_migrate"
-      end
-    end
-
-    # Run search and replace
-    task :run_filesearchandreplace do
-      on roles(:all) do
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:run_file_searchreplace_updates"
-      end
-    end
-
-    # Specific environment migration sql's. E.g. rename all fe-users etc..
-    # migrations should be placed in current/deploy/migrations/
-    # Run migrations (sql migrations)
-    task :run_migrations do
 
       on roles(:all) do
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:run_migrations"
-        execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:run_sql_updates"
-      end
-    end
 
-    #desc "Upgrade TYPO3 source in environment to latest minor version"
-    task :upgrade_source do
+        execute "echo '<?php' > #{fetch(:deploy_to)}/current/dummy/typo3conf/AdditionalConfiguration.php"
 
-      if(fetch(:t3_dont_upgrade_source)!=1)
-
-        on roles(:all) do
-          execute "cd #{fetch(:deploy_to)} && #{fetch(:rake_executable)} cap:update_typo3_source"
+        if fetch(:t3_add_unsafe_trusted_host_pattern)
+          execute "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"SYS\"][\"trustedHostsPattern\"] = \".*\";' >> #{fetch(:deploy_to)}/current/dummy/typo3conf/AdditionalConfiguration.php"
         end
 
-        print "\nsource has been upgraded"
-        print "\n\nWARNING: YOU MUST RUN THE UPGRADE SCRIPTS IN BACKEND\n\n"
+        if fetch(:t3_store_db_credentials_in_addionalconf)
+          execute "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"database\"] = \"#{fetch(:dbname)}\";' >> #{fetch(:deploy_to)}/current/dummy/typo3conf/AdditionalConfiguration.php"
+          execute "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"host\"] = \"#{fetch(:dbhost)}\";' >> #{fetch(:deploy_to)}/current/dummy/typo3conf/AdditionalConfiguration.php"
+          execute "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"password\"] = \"#{fetch(:dbpass)}\";' >> #{fetch(:deploy_to)}/current/dummy/typo3conf/AdditionalConfiguration.php"
+          execute "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"username\"] = \"#{fetch(:dbuser)}\";' >> #{fetch(:deploy_to)}/current/dummy/typo3conf/AdditionalConfiguration.php"
+        else
+          cmd1 =Typo3Helper::make_set_localconf_database_settings_command(fetch(:dbname),fetch(:dbuser),fetch(:dbpass),fetch(:dbhost))
+          execute "cd #{fetch(:deploy_to)} && #{cmd1}"
+
+          cmd2 = "mv #{fetch(:typo3_v6_local_conf_path)}.tmp #{fetch(:typo3_v6_local_conf_path)}"
+          execute "cd #{fetch(:deploy_to)} && #{cmd2}"
+        end
       end
+
     end
 
     task :restart_webserver do
@@ -410,36 +430,3 @@ deprecation_*.log
 
   end
 end
-
-
-namespace :test do
-  task :test_pre_setup do
-    on roles(:all) do
-      # test apache restart is allowed
-      # test ssh access to live server is allowed
-      # test stage is configured in typo3.yml
-    end
-  end
-
-  task :test_post_setup do
-    on roles(:all) do
-      # test if dummy index.php is readable, correctly linked
-      # temp cache files are removed
-    end
-  end
-
-  task :test_pre_deploy do
-    #if production test if repo is dirty
-    on roles(:all) do
-    end
-  end
-  task :test_post_deploy do
-    on roles(:all) do
-      #test symlinks
-      #test source version
-      #test database connection
-      #test chmods
-      #test chowns
-    end
-  end
-end