alcapon 0.4.2 → 0.4.3
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/capezit +14 -1
- data/lib/capez.rb +27 -15
- data/lib/ezpublish4.rb +1 -1
- data/lib/ezpublish5.rb +23 -4
- data/lib/utils.rb +4 -0
- metadata +3 -3
data/bin/capezit
CHANGED
@@ -139,9 +139,22 @@ files = {
|
|
139
139
|
# If not set, permissions remain unchanged
|
140
140
|
#set :shared_children_group, "#{webserver_group}"
|
141
141
|
|
142
|
-
# eZ Publish 5 only
|
142
|
+
# eZ Publish 5 only
|
143
|
+
|
144
|
+
# assets configuration (default is 'web')
|
143
145
|
#set :ezp5_assets_path, 'web'
|
144
146
|
|
147
|
+
# used by the console with --env=<env>
|
148
|
+
set :ezp5_env, 'prod'
|
149
|
+
|
150
|
+
# used by ezpublish:configure to generate ezp5 configuration files based on the ezp4 ones
|
151
|
+
#set :ezp5_siteaccess_groupname, 'ezflow_site'
|
152
|
+
#set :ezp5_admin_siteaccess, 'ezflow_site_admin'
|
153
|
+
|
154
|
+
# Set this to true if you want capez:settings:configure to be executed every time
|
155
|
+
# the application is deployed
|
156
|
+
set :ezp5_regenerate_config, false
|
157
|
+
|
145
158
|
# Which autoloads to generate. By default, regenerates extensions and
|
146
159
|
# kernel-override autoloads
|
147
160
|
# Possible values : see bin/php/ezpgenerateautoloads.php --help
|
data/lib/capez.rb
CHANGED
@@ -33,10 +33,10 @@ before "deploy:setup" do
|
|
33
33
|
end
|
34
34
|
|
35
35
|
after "deploy:setup", :roles => :web do
|
36
|
-
|
36
|
+
capez_puts_done
|
37
37
|
print_dotted( "--> Fixing permissions on deployment directory" )
|
38
38
|
try_sudo( "chown -R #{user} #{deploy_to}" ) # if not code checkout cannot be done :/
|
39
|
-
|
39
|
+
capez_puts_done
|
40
40
|
capez.var.init_shared
|
41
41
|
end
|
42
42
|
|
@@ -52,7 +52,7 @@ after "deploy:update_code" do
|
|
52
52
|
end
|
53
53
|
|
54
54
|
before "deploy:finalize_update" do
|
55
|
-
|
55
|
+
capez_puts_done
|
56
56
|
# Needed if you want to create extra shared directories under var/ with
|
57
57
|
# set :shared_children, [ "var/something",
|
58
58
|
# "var/something_else" ]
|
@@ -76,7 +76,7 @@ before "deploy:create_symlink" do
|
|
76
76
|
end
|
77
77
|
|
78
78
|
after "deploy:create_symlink" do
|
79
|
-
|
79
|
+
capez_puts_done
|
80
80
|
end
|
81
81
|
|
82
82
|
# Default behavior overrides
|
@@ -230,16 +230,16 @@ namespace :capez do
|
|
230
230
|
puts( "--> Creating eZ Publish var directories" )
|
231
231
|
print_dotted( "var " )
|
232
232
|
run( "mkdir -p #{shared_path}/var" )
|
233
|
-
|
233
|
+
capez_puts_done
|
234
234
|
|
235
235
|
print_dotted( "var/storage" )
|
236
236
|
run( "mkdir -p #{shared_path}/var/storage" )
|
237
|
-
|
237
|
+
capez_puts_done
|
238
238
|
|
239
239
|
storage_directories.each{ |sd|
|
240
240
|
print_dotted( "var/#{sd}/storage" )
|
241
241
|
run( "mkdir -p #{shared_path}/var/#{sd}/storage" )
|
242
|
-
|
242
|
+
capez_puts_done
|
243
243
|
}
|
244
244
|
run( "chmod -R g+w #{shared_path}/var")
|
245
245
|
run( "chown -R #{fetch(:webserver_group,:user)} #{shared_path}/var")
|
@@ -254,22 +254,34 @@ namespace :capez do
|
|
254
254
|
puts( "\n--> Release directories" )
|
255
255
|
|
256
256
|
if( ezp5? )
|
257
|
-
|
258
|
-
|
257
|
+
folders_path = [ "ezpublish/cache", "ezpublish/config", "ezpublish/logs", "#{fetch('ezp5_assets_path','web')}" ]
|
258
|
+
folders_path.each{ |fp|
|
259
|
+
print_dotted( "#{fp}" )
|
260
|
+
run( "mkdir -p #{latest_release}/#{fp}")
|
261
|
+
run( "chown -R #{fetch(:webserver_user,:user)}:#{fetch(:webserver_group,:user)} #{latest_release}/#{fp}" )
|
262
|
+
run( "chmod -R g+wx #{latest_release}/#{fp}" )
|
263
|
+
capez_puts_done
|
264
|
+
}
|
259
265
|
end
|
260
266
|
|
261
267
|
# creates a storage dir for elements specified by :storage_directories
|
262
268
|
storage_directories.each{ |sd|
|
263
269
|
print_dotted( "var/#{sd}/storage" )
|
264
270
|
run( "mkdir #{latest_release}/" + ezp_legacy_path( "var/#{sd}" ) )
|
265
|
-
|
271
|
+
capez_puts_done
|
266
272
|
}
|
267
273
|
|
268
274
|
# makes sure the webserver can write into var/
|
269
275
|
run( "chmod -R g+w #{latest_release}/" + ezp_legacy_path( "var" ) )
|
270
276
|
run( "chown -R #{fetch(:webserver_user,:user)}:#{fetch(:webserver_group,:user)} #{latest_release}/" + ezp_legacy_path( "var" ) )
|
277
|
+
|
271
278
|
# needed even if we just want to run 'bin/php/ezpgenerateautoloads.php' with --extension
|
272
|
-
|
279
|
+
# autoload seems to be mandatory for "old" version such as 4.0, 4.1, ...
|
280
|
+
print_dotted( ezp_legacy_path( "autoload" ) )
|
281
|
+
autoload_path = File.join( latest_release, ezp_legacy_path( 'autoload' ) )
|
282
|
+
run( "if [ ! -d #{autoload_path} ]; then mkdir -p #{autoload_path}; fi;" )
|
283
|
+
capez_puts_done
|
284
|
+
run( "chown -R #{fetch(:webserver_user,:user)}:#{fetch(:webserver_group,:user)} #{autoload_path}" )
|
273
285
|
end
|
274
286
|
|
275
287
|
desc <<-DESC
|
@@ -280,13 +292,13 @@ namespace :capez do
|
|
280
292
|
|
281
293
|
print_dotted( "var/storage" )
|
282
294
|
run( "ln -s #{shared_path}/var/storage #{latest_release}/" + ezp_legacy_path( "var/storage" ) )
|
283
|
-
|
295
|
+
capez_puts_done
|
284
296
|
|
285
297
|
storage_directories.each{ |sd|
|
286
298
|
print_dotted( "var/#{sd}/storage" )
|
287
299
|
run( "ln -s #{shared_path}/var/#{sd}/storage #{latest_release}/" + ezp_legacy_path( "var/#{sd}/storage" ), :as => webserver_user )
|
288
300
|
#run( "chmod -h g+w #{latest_release}/var/#{sd}/storage")
|
289
|
-
|
301
|
+
capez_puts_done
|
290
302
|
}
|
291
303
|
|
292
304
|
run( "chmod -R g+w #{latest_release}/" + ezp_legacy_path( "var" ) )
|
@@ -347,13 +359,13 @@ namespace :capez do
|
|
347
359
|
task :generate do
|
348
360
|
if autoload_list.count == 0
|
349
361
|
print_dotted( "--> eZ Publish autoloads (disabled)", :sol => true )
|
350
|
-
|
362
|
+
capez_puts_done
|
351
363
|
else
|
352
364
|
puts( "\n--> eZ Publish autoloads " )
|
353
365
|
autoload_list.each { |autoload|
|
354
366
|
print_dotted( "#{autoload}" )
|
355
367
|
capture( "cd #{latest_release}/#{ezp_legacy_path} && sudo -u #{webserver_user} php bin/php/ezpgenerateautoloads.php --#{autoload}" )
|
356
|
-
|
368
|
+
capez_puts_done
|
357
369
|
}
|
358
370
|
end
|
359
371
|
end
|
data/lib/ezpublish4.rb
CHANGED
@@ -27,7 +27,7 @@ namespace :capez do
|
|
27
27
|
cache_list.each { |cache_tag|
|
28
28
|
print_dotted( "#{cache_tag}" )
|
29
29
|
capture "cd #{current_path}/#{ezp_legacy_path} && sudo -u #{webserver_user} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
|
30
|
-
|
30
|
+
capez_puts_done
|
31
31
|
}
|
32
32
|
end
|
33
33
|
end
|
data/lib/ezpublish5.rb
CHANGED
@@ -9,8 +9,11 @@ after "deploy:finalize_update" do
|
|
9
9
|
end
|
10
10
|
capez.var.init_release
|
11
11
|
capez.var.link
|
12
|
-
capez.settings.deploy
|
13
12
|
capez.autoloads.generate
|
13
|
+
capez.settings.deploy
|
14
|
+
if ( fetch( :ezp5_regenerate_config, false ) )
|
15
|
+
capez.settings.configure
|
16
|
+
end
|
14
17
|
capez.assets.install
|
15
18
|
end
|
16
19
|
|
@@ -29,7 +32,7 @@ namespace :capez do
|
|
29
32
|
cache_list.each { |cache_tag|
|
30
33
|
print_dotted( "#{cache_tag}" )
|
31
34
|
capture "cd #{current_path}/#{ezp_legacy_path} && sudo -u #{webserver_user} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
|
32
|
-
|
35
|
+
capez_puts_done
|
33
36
|
}
|
34
37
|
end
|
35
38
|
end
|
@@ -40,10 +43,26 @@ namespace :capez do
|
|
40
43
|
DESC
|
41
44
|
task :install do
|
42
45
|
|
43
|
-
|
44
|
-
|
46
|
+
capture( "cd #{latest_release} && sudo -u #{webserver_user} php ezpublish/console assets:install --symlink #{fetch('ezp5_assets_path','web')}" )
|
47
|
+
capture( "cd #{latest_release} && sudo -u #{webserver_user} php ezpublish/console ezpublish:legacy:assets_install --symlink #{fetch('ezp5_assets_path','web')}" )
|
45
48
|
|
46
49
|
end
|
47
50
|
end
|
48
51
|
|
52
|
+
namespace :settings do
|
53
|
+
desc <<-DESC
|
54
|
+
Generate yml (ezp5) based on ini (ezp4)
|
55
|
+
DESC
|
56
|
+
task :configure do
|
57
|
+
|
58
|
+
if( fetch('ezp5_siteaccess_groupname',false) != false && fetch('ezp5_admin_siteaccess',false) != false )
|
59
|
+
capture( "cd #{latest_release} && sudo -u #{webserver_user} php ezpublish/console ezpublish:configure --env=#{fetch('ezp5_env','prod')} #{ezp5_siteaccess_groupname} #{ezp5_admin_siteaccess}" )
|
60
|
+
else
|
61
|
+
abort( "Since version 0.4.3, you need to set ezp5_siteaccess_groupname & ezp5_admin_siteaccess".red )
|
62
|
+
end
|
63
|
+
|
64
|
+
end
|
65
|
+
|
66
|
+
end
|
67
|
+
|
49
68
|
end
|
data/lib/utils.rb
CHANGED
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 4
|
8
|
-
-
|
9
|
-
version: 0.4.
|
8
|
+
- 3
|
9
|
+
version: 0.4.3
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Arnaud Lafon
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2012-12-
|
17
|
+
date: 2012-12-11 00:00:00 +01:00
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|