alcapon 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: 5b32b65442d04520c04fbf9fe0e8de485e2e9fadf849ca77c0aa574f6b408021f677fd6ed7c8fa4234040d0b93913e243039534997456f41ae9c99f885495850
-  metadata.gz: 7d716301517f09d650c0f1d585bd33e687b87b18de8880c749aef5ceae18cf567c02de501fe320b9eb439b44b651570a74c7f290e81772c137f616bd3a5e319b
+  metadata.gz: c4b3c4e5bc5f32e434c050a7ba53bc2de7df3ccade3e1d13d1182fa997723ef35f525d36a097bd29db297795b5a9e12c2434effba6a997a7f95959f2f2af13b9
+  data.tar.gz: b8f088f477376fddf6be0fde02091929977e169d96729738cb5020c6f1dffc6a17f09c19291d4abc5518b801fd8a13ce931d9ab20f205cd95dceea9602ebf1cf
 SHA1: 
-  data.tar.gz: 76de8e19717fc3358b4cba3a4366c9b8e07cd024
-  metadata.gz: 8054168a93ce72534b412c70307fb982fe3d12fe
+  metadata.gz: 39a640f5e7f942afefdb1c349db664d3a01acb37
+  data.tar.gz: db948e03e598902cac8a019fdacbc8011a611c9f

data/bin/capezit

@@ -4,7 +4,7 @@ require 'optparse'
 require 'fileutils'
 
 ezpublish_version  = nil
-alcapon_version = "0.4.7"
+alcapon_version = "0.4.8"
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"
@@ -129,6 +129,7 @@ files = {
     # By default, this is the user as the one used to connect via SSH
     set :webserver_user, :user
     set :webserver_group, :user
+    set :php_user, :user
 
     # If true, will always turn your webserver offline
     # Requires a specific rewrite rule (see documentation)
@@ -170,6 +171,7 @@ files = {
 
     # Set this to true if you want capez:settings:configure to be executed every time
     # the application is deployed
+    # IMPORTANT: requires that the database is already created before it is run
     set :ezp5_regenerate_config, false
 
     # Which autoloads to generate. By default, regenerates extensions and
@@ -212,6 +214,7 @@ files = {
     # This is used for permissions related tasks
     #set :webserver_user, :user
     #set :webserver_group, :user
+    #set :php_user, :user
   FILE
 
   "#{alcapon_path}/config/deploy/production.rb" => unindent(<<-FILE)
@@ -226,6 +229,7 @@ files = {
     # This is used for permissions related tasks
     #set :webserver_user, :user
     #set :webserver_group, :user
+    #set :php_user, :user
 
     #set :file_changes, {
     #    'settings/override/site.ini.append.dist' => {

data/lib/capez.rb

@@ -380,7 +380,7 @@ namespace :ezpublish do
         puts( "\n--> eZ Publish autoloads " )
         autoload_list.each { |autoload|
           print_dotted( "#{autoload}" )
-          capture( "cd #{latest_release}/#{ezp_legacy_path} && sudo -u #{webserver_user} php bin/php/ezpgenerateautoloads.php --#{autoload}" )
+          capture( "cd #{latest_release}/#{ezp_legacy_path} && sudo -u #{fetch(:php_user,user)} php bin/php/ezpgenerateautoloads.php --#{autoload}" )
           capez_puts_done
         }
       end

data/lib/ezpublish4.rb

@@ -26,7 +26,7 @@ namespace :ezpublish do
       puts( "\n--> Clearing caches #{'with --purge'.red if cache_purge}" )
       cache_list.each { |cache_tag|
         print_dotted( "#{cache_tag}" )
-        capture "cd #{current_path}/#{ezp_legacy_path} && sudo -u #{webserver_user} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
+        capture "cd #{current_path}/#{ezp_legacy_path} && sudo -u #{fetch(:php_user,user)} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
         capez_puts_done
       }
     end

data/lib/ezpublish5.rb

@@ -14,9 +14,9 @@ after "deploy:finalize_update" do
   ezpublish.var.link
   ezpublish.autoloads.generate
   ezpublish.settings.deploy
+  ezpublish.assets.install
   if ( fetch( :ezp5_regenerate_config, false ) )
     ezpublish.settings.configure
   end
-  ezpublish.assets.install
 end
 

data/lib/ezpublish5/ezpublish.rb

@@ -12,7 +12,7 @@ namespace :ezpublish do
       puts( "\n--> Clearing caches #{'with --purge'.red if cache_purge}" )
       cache_list.each { |cache_tag|
         print_dotted( "#{cache_tag}" )
-        capture "cd #{current_path}/#{ezp_legacy_path} && sudo -u #{webserver_group} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
+        capture "cd #{current_path}/#{ezp_legacy_path} && sudo -u #{fetch(:php_user,user)} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
         capez_puts_done
       }
     end
@@ -24,8 +24,8 @@ namespace :ezpublish do
     DESC
     task :install do
       print_dotted( "\n--> Generating web assets in #{fetch('ezp5_assets_path','web')}" )
-      capture( "cd #{latest_release} && sudo -u #{webserver_group} php ezpublish/console assets:install --symlink #{fetch('ezp5_assets_path','web')}" )
-      capture( "cd #{latest_release} && sudo -u #{webserver_group} php ezpublish/console ezpublish:legacy:assets_install --symlink #{fetch('ezp5_assets_path','web')}" )
+      capture( "cd #{latest_release} && sudo -u #{fetch(:php_user,user)} php ezpublish/console assets:install --symlink #{fetch('ezp5_assets_path','web')}" )
+      capture( "cd #{latest_release} && sudo -u #{fetch(:php_user,user)} php ezpublish/console ezpublish:legacy:assets_install --symlink #{fetch('ezp5_assets_path','web')}" )
       capez_puts_done
     end
   end
@@ -37,7 +37,7 @@ namespace :ezpublish do
     task :configure do
       print_dotted( "\n--> Generating ezp5 configuration files from ezp4 ones" )
       if( fetch('ezp5_siteaccess_groupname',false) != false && fetch('ezp5_admin_siteaccess',false) != false )
-        capture( "cd #{latest_release} && sudo -u #{webserver_group} php ezpublish/console ezpublish:configure --env=#{fetch('ezp5_env','prod')} #{ezp5_siteaccess_groupname} #{ezp5_admin_siteaccess}" )
+        capture( "cd #{latest_release} && sudo -u #{fetch(:php_user,user)} php ezpublish/console ezpublish:configure --env=#{fetch('ezp5_env','prod')} #{ezp5_siteaccess_groupname} #{ezp5_admin_siteaccess}" )
       else
         abort( "Since version 0.4.3, you need to set ezp5_siteaccess_groupname & ezp5_admin_siteaccess".red )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alcapon
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Arnaud Lafon