Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Decouple Install from Site Creation #4

Open
wants to merge 8 commits into
base: 7.x-3.x
Choose a base branch
from
Open

[WIP] Decouple Install from Site Creation #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f887495
Trigger "verify" task instead of "install" task when site is created.
jonpugh Jun 23, 2016
a140cc3
Merge branch '7.x-3.x' of git.drupal.org:project/hosting into decoupl…
jonpugh Jun 23, 2016
e074515
Merge branch '7.x-3.x' into decouple-install
jonpugh Jul 9, 2016
7cc339d
Unhide the install task, for now. We will have to conditionally hide …
jonpugh Jul 11, 2016
4597c5a
If site status is not explicity disabled or deleted, set to enabled.
jonpugh Jul 11, 2016
5d8134a
Issue #2754069: Run a verify instead of an install task when a site i…
jonpugh Aug 20, 2016
4970db6
Merge branch '7.x-3.x' into decouple-install
jonpugh Aug 20, 2016
4d416bd
Merge branch 'decouple-install' of github.com:aegir-project/hosting i…
jonpugh Aug 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions site/hosting_site.drush.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,12 @@ function hosting_site_post_hosting_verify_task($task, $data) {
if ($data['context']['cron_key']) {
$task->ref->cron_key = $data['context']['cron_key'];
}

// If site status is not explicity disabled or deleted, set to enabled.
if ($task->ref->site_status != HOSTING_SITE_DISABLED && $task->ref->site_status != HOSTING_SITE_DELETED) {
$task->ref->site_status = HOSTING_SITE_ENABLED;
}

node_save($task->ref);

$context = $data['context'];
Expand Down
2 changes: 1 addition & 1 deletion site/hosting_site.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ function hosting_site_hosting_tasks() {
$tasks['site']['install'] = array(
'title' => t('Install'),
'description' => t('Install a site'),
'hidden' => TRUE,
// 'hidden' => TRUE,
'provision_save' => TRUE,
);

Expand Down
2 changes: 1 addition & 1 deletion site/hosting_site.nodeapi.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ function hosting_site_node_insert($node) {
hosting_add_task($node->nid, 'import');
}
else {
hosting_add_task($node->nid, 'install');
hosting_add_task($node->nid, 'verify');
}
}
}
Expand Down