Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
provision
Commits
7602c3bd
Commit
7602c3bd
authored
Apr 07, 2009
by
Adrian Rossouw
Committed by
adrian
Apr 07, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor to use the new drush conditional include api (
#415108
)
parent
57b6fd56
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
23 additions
and
33 deletions
+23
-33
platform/deploy.provision.inc
platform/deploy.provision.inc
+1
-1
platform/drupal/clear.inc
platform/drupal/clear.inc
+0
-0
platform/drupal/deploy.inc
platform/drupal/deploy.inc
+0
-0
platform/drupal/import_5.inc
platform/drupal/import_5.inc
+0
-0
platform/drupal/import_6.inc
platform/drupal/import_6.inc
+0
-0
platform/drupal/import_7.inc
platform/drupal/import_7.inc
+0
-0
platform/drupal/install_5.inc
platform/drupal/install_5.inc
+0
-0
platform/drupal/install_6.inc
platform/drupal/install_6.inc
+0
-0
platform/drupal/install_7.inc
platform/drupal/install_7.inc
+0
-0
platform/drupal/packages.inc
platform/drupal/packages.inc
+0
-0
platform/drupal/packages_5.inc
platform/drupal/packages_5.inc
+0
-0
platform/drupal/update_5.inc
platform/drupal/update_5.inc
+0
-0
platform/drupal/update_6.inc
platform/drupal/update_6.inc
+0
-0
platform/drupal/update_7.inc
platform/drupal/update_7.inc
+0
-0
platform/drupal/verify.inc
platform/drupal/verify.inc
+0
-0
platform/import.provision.inc
platform/import.provision.inc
+1
-1
platform/install.provision.inc
platform/install.provision.inc
+1
-1
platform/provision_drupal.drush.inc
platform/provision_drupal.drush.inc
+15
-4
platform/update.provision.inc
platform/update.provision.inc
+2
-2
provision.inc
provision.inc
+0
-21
web_server/verify.provision.inc
web_server/verify.provision.inc
+3
-3
No files found.
platform/deploy.provision.inc
View file @
7602c3bd
...
...
@@ -95,6 +95,6 @@ function provision_drupal_provision_deploy_rollback($url) {
function
provision_drupal_post_provision_deploy
(
$url
)
{
drush_invoke
(
'provision update'
,
$url
);
provision_platform_include
(
dirname
(
__FILE__
)
,
'deploy'
);
drush_include_engine
(
'drupal'
,
'deploy'
);
drush_set_option
(
'packages'
,
_scrub_object
(
provision_drupal_system_map
()),
'site'
);
}
platform/drupal
_
clear.inc
→
platform/drupal
/
clear.inc
View file @
7602c3bd
File moved
platform/drupal
_
deploy.inc
→
platform/drupal
/
deploy.inc
View file @
7602c3bd
File moved
platform/drupal
_5_
import.inc
→
platform/drupal
/
import
_5
.inc
View file @
7602c3bd
File moved
platform/drupal
_6_
import.inc
→
platform/drupal
/
import
_6
.inc
View file @
7602c3bd
File moved
platform/drupal
_7_
import.inc
→
platform/drupal
/
import
_7
.inc
View file @
7602c3bd
File moved
platform/drupal
_5_
install.inc
→
platform/drupal
/
install
_5
.inc
View file @
7602c3bd
File moved
platform/drupal
_6_
install.inc
→
platform/drupal
/
install
_6
.inc
View file @
7602c3bd
File moved
platform/drupal
_7_
install.inc
→
platform/drupal
/
install
_7
.inc
View file @
7602c3bd
File moved
platform/drupal
_
packages.inc
→
platform/drupal
/
packages.inc
View file @
7602c3bd
File moved
platform/drupal
_5_
packages.inc
→
platform/drupal
/
packages
_5
.inc
View file @
7602c3bd
File moved
platform/drupal
_5_
update.inc
→
platform/drupal
/
update
_5
.inc
View file @
7602c3bd
File moved
platform/drupal
_6_
update.inc
→
platform/drupal
/
update
_6
.inc
View file @
7602c3bd
File moved
platform/drupal
_7_
update.inc
→
platform/drupal
/
update
_7
.inc
View file @
7602c3bd
File moved
platform/drupal
_
verify.inc
→
platform/drupal
/
verify.inc
View file @
7602c3bd
File moved
platform/import.provision.inc
View file @
7602c3bd
...
...
@@ -19,6 +19,6 @@ function provision_drupal_provision_import_validate() {
*/
function
provision_drupal_provision_import
(
$url
=
NULL
)
{
drush_bootstrap
(
DRUSH_BOOTSTRAP_DRUPAL_FULL
);
provision_platform_include
(
dirname
(
__FILE__
)
,
'import'
);
drush_include_engine
(
'drupal'
,
'import'
);
}
platform/install.provision.inc
View file @
7602c3bd
...
...
@@ -38,7 +38,7 @@ function provision_drupal_provision_install($url) {
// Requires at least the database settings to complete.
_provision_drupal_create_settings_file
(
$url
);
drush_bootstrap
(
DRUSH_BOOTSTRAP_DRUPAL_SITE
);
provision_platform_include
(
dirname
(
__FILE__
)
,
'install'
);
drush_include_engine
(
'drupal'
,
'install'
);
drush_set_option
(
'installed'
,
TRUE
,
'site'
);
}
...
...
platform/provision_drupal.drush.inc
View file @
7602c3bd
...
...
@@ -30,6 +30,18 @@ function provision_drupal_drush_help($section) {
}
function
provision_drupal_drush_engine_drupal
()
{
$engines
=
array
();
$engines
[
'install'
]
=
array
();
$engines
[
'update'
]
=
array
();
$engines
[
'import'
]
=
array
();
$engines
[
'deploy'
]
=
array
();
$engines
[
'clear'
]
=
array
();
$engines
[
'packages'
]
=
array
();
$engines
[
'verify'
]
=
array
();
return
$engines
;
}
/**
* Initialize the platform / site
*
...
...
@@ -243,8 +255,7 @@ function _provision_drupal_create_directories($url, $profile = NULL) {
function
_provision_drupal_rebuild_caches
(
$url
=
NULL
)
{
if
(
PROVISION_CONTEXT_SITE
)
{
#drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_FULL);
provision_platform_include
(
dirname
(
__FILE__
),
'clear'
);
drush_include_engine
(
'drupal'
,
'clear'
);
}
}
...
...
@@ -382,7 +393,7 @@ require_once('cvs_deploy.inc');
function
provision_find_packages
()
{
// Load the version specific include files.
provision_platform_include
(
dirname
(
__FILE__
)
,
'packages'
);
drush_include_engine
(
'drupal'
,
'packages'
);
$packages
[
'base'
]
=
_provision_find_packages
(
'base'
);
...
...
@@ -440,7 +451,7 @@ function _provision_find_packages($scope, $key = '') {
*/
function
provision_drupal_system_map
()
{
// Load the version specific include files.
provision_platform_include
(
dirname
(
__FILE__
)
,
'packages'
);
drush_include_engine
(
'drupal'
,
'packages'
);
$profiles
=
_provision_find_profiles
();
foreach
(
$profiles
as
$profile
=>
$info
)
{
...
...
platform/update.provision.inc
View file @
7602c3bd
...
...
@@ -7,6 +7,6 @@ function provision_drupal_provision_update_validate() {
function
provision_drupal_provision_update
(
$url
)
{
_provision_drupal_create_settings_file
(
$url
);
drush_bootstrap
(
DRUSH_BOOTSTRAP_DRUPAL_SITE
);
provision_platform_include
(
dirname
(
__FILE__
)
,
'update'
);
provision_platform_include
(
dirname
(
__FILE__
)
,
'clear'
);
drush_include_engine
(
'drupal'
,
'update'
);
drush_include_engine
(
'drupal'
,
'clear'
);
}
provision.inc
View file @
7602c3bd
...
...
@@ -282,27 +282,6 @@ function provision_password($length = 10) {
return
$pass
;
}
function
provision_platform_include
(
$path
,
$command
,
$version
=
null
,
$platform
=
'drupal'
)
{
$version
=
(
$version
)
?
$version
:
drush_drupal_major_version
();
$options
[]
=
sprintf
(
"%s_%s_%s"
,
$platform
,
$version
,
$command
);
$options
[]
=
sprintf
(
"%s_%s"
,
$platform
,
$command
);
$options
[]
=
sprintf
(
"%s"
,
$command
);
$match
=
false
;
foreach
(
$options
as
$option
)
{
$file
=
sprintf
(
"%s/%s.inc"
,
$path
,
$option
);
if
(
file_exists
(
$file
))
{
$match
=
$file
;
break
;
}
}
if
(
$match
)
{
drush_log
(
dt
(
'Including platform specific file : @file'
,
array
(
'@file'
=>
$match
)));
include_once
(
$file
);
}
}
function
_provision_errors_on
()
{
$errors
=&
drush_get_context
(
'DRUPAL_ERROR_REPORTING'
,
E_ALL
^
E_NOTICE
);
$errors
=
error_reporting
(
$errors
);
...
...
web_server/verify.provision.inc
View file @
7602c3bd
<?php
function
provision_apache_provision_verify
(
$url
)
{
function
provision_apache_provision_verify
(
$url
=
null
)
{
if
(
PROVISION_CONTEXT_PLATFORM
)
{
_provision_create_dir
(
drush_get_option
(
'vhost_path'
),
dt
(
"Virtual host configuration"
),
0700
);
$data
=
drush_get_merged_options
();
$options
=
drush_get_
context
(
'
options
'
);
$options
=
drush_get_
merged_
options
(
);
$data
[
'extra_config'
]
=
"# Extra configuration from modules:
\n
"
;
$data
[
'extra_config'
]
.
=
join
(
"
\n
"
,
drush_command_invoke_all
(
'provision_apache_dir_config'
,
$data
));
_provision_apache_create_config
(
'platform_'
.
$options
[
'platform'
]
.
'.conf'
,
$data
,
_provision_apache_platform_template
());
...
...
@@ -15,7 +15,7 @@ function provision_apache_provision_verify($url) {
_provision_apache_restart_apache
(
TRUE
);
}
function
provision_apache_post_provision_verify
(
$url
)
{
function
provision_apache_post_provision_verify
(
$url
=
null
)
{
if
(
PROVISION_CONTEXT_PLATFORM
)
{
drush_set_option
(
'master_url'
,
drush_get_option
(
'master_url'
),
'drupal'
);
drush_set_option
(
'publish_path'
,
drush_get_option
(
'publish_path'
),
'drupal'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment