Commit afac41c3 authored by Adrian Rossouw's avatar Adrian Rossouw

Merge branch 'master' of ssh://git.aegirproject.org/hostmaster

parents 2bbef7be 1e2fc20e
......@@ -145,7 +145,6 @@ function hostmaster_bootstrap() {
$node->type = 'package';
$node->package_type = 'profile';
$node->short_name = 'hostmaster';
$node->import = true;
$node->status = 1;
node_save($node);
$profile_id = $node->nid;
......@@ -159,6 +158,8 @@ function hostmaster_bootstrap() {
$node->client = $client_id;
$node->db_server = $db_server;
$node->profile = $profile_id;
$node->import = true;
$node->hosting_name = 'hostmaster';
$node->status = 1;
node_save($node);
......
......@@ -476,7 +476,7 @@ function hosting_site_insert(&$node) {
db_query("INSERT INTO {hosting_site} (vid, nid, client, db_server, platform, profile, language, last_cron, status, verified, port, `ssl`, ssl_redirect) VALUES (%d, %d, %d, %d, %d, %d, '%s', %d, %d, %d, %d, %d, %d)",
$node->vid, $node->nid, $node->client, $node->db_server, $node->platform, $node->profile, $node->site_language, $node->last_cron, $node->site_status, $node->verified, $node->port, $node->ssl, $node->ssl_redirect);
if ((!$node->old_vid)) {
hosting_context_register($node->nid, $node->title);
hosting_context_register($node->nid, ($node->hosting_name) ? $node->hosting_name : $node->title);
if ($node->import) {
hosting_add_task($node->nid, 'import');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment