capistrano-typo3 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3149ce6e92c9d14a232b343e3aaca2ff8c1c68ddbb0f74da2eaadd44398fbe1
-  data.tar.gz: 77501477dcb4a25a9b0f7f8babc6572aa0f985e4bc9d13edcfb8f3fd8a30584f
+  metadata.gz: 88c5218fc52ac8dc7402296ac0feee6a3b4e9f2a07dd99737b4d0083209300bd
+  data.tar.gz: ed1ac4e834a68cdaef9af49d3776009a9aa5aa0748bdfd15e1b33d1b55847707
 SHA512:
-  metadata.gz: 31f64984fc9f162e91d1d4e6c81c6c3f885ea3ee283ea259fa7253f4c844c33fc1ea52cf6c8027efcbfb558e8737316b4c967182d50a9922bd162f792fda2a4d
-  data.tar.gz: 4ba6dda92f2f5358cb8b8a7a5ae6f6cfc736f4ba3ff8e7e9b00212e877337777deb78d06031b56323197815acc0d58c93f943dad4c055d0805d5b8464d698339
+  metadata.gz: 7b6e525ee8fc3d281928c6a9dafe522e62489396d1ba2c1d07d204041ff0156f84b27fb16d230b8bb7aa2bbd07218602528cdfbae7609c09d462d69ceab17751
+  data.tar.gz: 37b812ebec06c666df4bec485cd049c3d1b957b31e12cbd7ddbb8f6895f49dee6e0b3eb1e324ee7aa871e4fdb655aab04098de8b014e7313de409b850f8dffaf

data/CHANGELOG.md

@@ -1,9 +1,12 @@
 # CHANGELOG
 
+
+## capistrano-typo3 0.5.5
+- restore passwordless sync for local syncs e.g. CCV certificatie
+
 ## capistrano-typo3 0.5.4
 - make git recursive optional
 
-
 ## capistrano-typo3 0.3.2
 - make mysql dump transfer possible on same server with different users
 

data/lib/capistrano/tasks/typo3content.cap

@@ -19,8 +19,7 @@ namespace :typo3 do
 
         ignorestring = ""
 
-        if(:t3_db_sync_ignore_tables)
-
+        if(defined? :t3_db_sync_ignore_tables)
           fetch(:t3_db_sync_ignore_tables).each do | ignore_tbl |
             ignorestring = "#{ignorestring} --ignore-table=#{fetch(:t3_live_sync)['dbsync']['dbname']}.#{ignore_tbl}"
           end
@@ -29,19 +28,19 @@ namespace :typo3 do
         # DUMP DATABASE TO IMAGE
         system <<DBSYNC1
           ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
-          'mysqldump -u#{fetch(:t3_live_sync)['dbsync']['dbuser']} \
+          'mysqldump --no-tablespaces -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-src-#{fetch(:t3_live_sync)['dbsync']['dbname']}'
 DBSYNC1
 
-        if(:t3_db_sync_ignore_tables)
+        if(defined? :t3_db_sync_ignore_tables)
           fetch(:t3_db_sync_ignore_tables).each do | ignore_tbl |
 
             system <<DBSYNC1
           ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
-          'mysqldump -u#{fetch(:t3_live_sync)['dbsync']['dbuser']} \
+          'mysqldump --no-tablespaces -u#{fetch(:t3_live_sync)['dbsync']['dbuser']} \
           -h#{fetch(:t3_live_sync)['dbsync']['dbhost']} \
           -p#{fetch(:t3_live_sync)['dbsync']['dbpass']} \
           --no-data \

data/lib/capistrano/tasks/typo3helper.cap

@@ -57,6 +57,29 @@ deprecation_*.log
       end
     end
 
+    desc "update LocalConf with correct db credentionals without SSH"
+    task :update_localconf_local do
+
+      system "echo '<?php' > dummy/typo3conf/AdditionalConfiguration.php"
+
+      if fetch(:t3_add_unsafe_trusted_host_pattern)
+        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"SYS\"][\"trustedHostsPattern\"] = \".*\";' >> dummy/typo3conf/AdditionalConfiguration.php"
+      end
+
+      if fetch(:t3_store_db_credentials_in_addionalconf)
+        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"database\"] = \"#{fetch(:dbname)}\";' >> dummy/typo3conf/AdditionalConfiguration.php"
+        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"host\"] = \"#{fetch(:dbhost)}\";' >> dummy/typo3conf/AdditionalConfiguration.php"
+        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"password\"] = \"#{fetch(:dbpass)}\";' >> dummy/typo3conf/AdditionalConfiguration.php"
+        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"username\"] = \"#{fetch(:dbuser)}\";' >> dummy/typo3conf/AdditionalConfiguration.php"
+      else
+        cmd1 =Typo3Helper::make_set_localconf_database_settings_command(fetch(:dbname),fetch(:dbuser),fetch(:dbpass),fetch(:dbhost))
+        system "cd #{fetch(:deploy_to)} && #{cmd1}"
+
+        cmd2 = "mv #{fetch(:typo3_v6_local_conf_path)}.tmp #{fetch(:typo3_v6_local_conf_path)}"
+        system "cd #{fetch(:deploy_to)} && #{cmd2}"
+      end
+    end
+
     desc "update LocalConf with correct db credentionals"
     task :update_localconf do
 

data/lib/capistrano/typo3/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Typo3
-    VERSION = "0.5.4"
+    VERSION = "0.5.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-typo3
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Pim Snel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,7 +106,7 @@ homepage: https://github.com/Lingewoud/capistrano-typo3
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Capistrano 3 tasks and CI for TYPO3
 test_files: []