Skip to content
Commits on Source (8)
Hide whitespace changes
Inline Side-by-side
Provision/Config/Drupal/provision_drupal_settings.tpl.php
View file @ 3b8ff33b
......@@ -135,10 +135,12 @@ if (isset($_SERVER['db_name'])) {
$drupal_hash_salt = '';
<?php endif; ?>
<?php if (isset($config_directories_active_var)): ?>
$config_directories['active'] = 'private/config/active';
$config_directories['active']['path'] = 'sites/<?php print $this->uri ?>/private/config/active';
$config_directories['active']['absolute'] = TRUE;
<?php endif; ?>
<?php if (isset($config_directories_staging_var)): ?>
$config_directories['staging'] = 'private/config/staging';
$config_directories['staging']['path'] = 'sites/<?php print $this->uri ?>/private/config/staging';
$config_directories['staging']['absolute'] = TRUE;
<?php endif; ?>
$conf['clean_url'] = 1;
$conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
......
platform/drupal/clear_8.inc
View file @ 3b8ff33b
......@@ -5,17 +5,6 @@
* Rebuild all the caches
*/
cache_clear_all();
drush_log(t('Cleared all caches'));
drupal_flush_all_caches();
drush_log(t('All caches flushed'));
node_types_rebuild();
drush_log(t('Rebuilt node type cache'));
registry_rebuild();
drush_log(t('Rebuilt code registry'));
system_rebuild_theme_data();
drush_log(t('Rebuilt theme cache'));
menu_rebuild();
drush_log(t('Rebuilt menu cache'));
platform/drupal/install_8.inc
View file @ 3b8ff33b
......@@ -16,13 +16,30 @@ function install_send_welcome_mail($url, $account, $language, $client_email, $on
if ($client_email) {
// Mail one time login URL and instructions.
$from = variable_get('site_mail', ini_get('sendmail_from'));
$username = $account->getUsername();
$site = variable_get('site_name', 'Drupal');
$uri_brief = preg_replace('!^https?://!', '', $base_url);
$mailto = $account->getEmail();
$date = format_date(time());
$login_uri = url('user', array('absolute' => TRUE));
$edit_uri = url('user/'. $account->id() .'/edit', array('absolute' => TRUE));
$mail_params['variables'] = array(
'!username' => $account->name, '!site' => variable_get('site_name', 'Drupal'), '!login_url' => $onetime,
'!uri' => $base_url, '!uri_brief' => preg_replace('!^https?://!', '', $base_url), '!mailto' => $account->mail,
'!date' => format_date(time()), '!login_uri' => url('user', array('absolute' => TRUE)),
'!edit_uri' => url('user/'. $account->uid .'/edit', array('absolute' => TRUE)));
'!username' => $username,
'!site' => $site,
'!login_url' => $onetime,
'!uri' => $base_url,
'!uri_brief' => $uri_brief,
'!mailto' => $mailto,
'!date' => $date,
'!login_uri' => $login_uri,
'!edit_uri' => $edit_uri,
);
$mail_success = drupal_mail('install', 'welcome-admin', $account->mail, user_preferred_language($account), $mail_params, $from, TRUE);
$langcode = $account->getPreferredLangcode();
$mail_success = drupal_mail('install', 'welcome-admin', $mailto, $langcode, $mail_params, $from, TRUE);
if ($mail_success) {
drush_log(t('Sent welcome mail to @client', array('@client' => $client_email)), 'message');
......@@ -57,8 +74,8 @@ function install_mail($key, &$message, $params) {
}
if ($custom) {
$message['subject'] = st($mail['subject'], $params['variables']);
$message['body'][] = st($mail['body'], $params['variables']);
$message['subject'] = t($mail['subject'], $params['variables']);
$message['body'][] = t($mail['body'], $params['variables']);
}
else {
$message['subject'] = _user_mail_text('pass_subject', $params['variables']);
......@@ -84,6 +101,9 @@ function install_main() {
if (function_exists('drush_sql_read_db_spec')) {
$db_spec = drush_sql_read_db_spec();
}
else if (function_exists('_drush_sql_get_db_spec')) {
$db_spec = _drush_sql_get_db_spec();
}
else {
$db_spec = drush_core_site_install_db_spec();
}
......@@ -138,21 +158,21 @@ function install_main() {
// create the admin account
$account = user_load(1);
$edit['name'] = 'admin';
$edit['pass'] = $account_pass;
$edit['mail'] = $client_email;
$edit['status'] = 1;
$account->name = 'admin';
$account->pass = $account_pass;
$account->mail = $client_email;
$account->status = 1;
// temporarily disable drupal's default mail notification
$prev = variable_get('user_mail_status_activated_notify', TRUE);
variable_set('user_mail_status_activated_notify', FALSE);
$account = user_save($account, $edit);
$account->save();
variable_set('user_mail_status_activated_notify', $prev);
$onetime = user_pass_reset_url($account);
// Store the one time login link in an option so the front end can direct the user to their new site.
drush_set_option('login_link', $onetime);
drush_log(t('Login url: !onetime', array('!onetime' => $onetime)), 'message');
drush_set_option('login_link', $onetime . '/login');
drush_log(t('Login url: !onetime', array('!onetime' => $onetime . '/login')), 'message');
if ($client_email) {
install_send_welcome_mail($url, $account, $install_locale, $client_email, $onetime);
......
platform/provision_drupal.drush.inc
View file @ 3b8ff33b
......@@ -238,17 +238,14 @@ function _provision_drupal_create_directories($url = NULL, $profile = NULL) {
$chgrp["sites/$url/files/styles"] = d('@server_master')->web_group;
// d8 support
$mkdir["sites/$url/files/private"] = 02770;
$chgrp["sites/$url/files/private"] = d('@server_master')->web_group;
$mkdir["sites/$url/private/config"] = 02770;
$chgrp["sites/$url/private/config"] = d('@server_master')->web_group;
$mkdir["sites/$url/files/private/config"] = 02770;
$chgrp["sites/$url/files/private/config"] = d('@server_master')->web_group;
$mkdir["sites/$url/private/config/active"] = 02770;
$chgrp["sites/$url/private/config/active"] = d('@server_master')->web_group;
$mkdir["sites/$url/files/private/config/active"] = 02770;
$chgrp["sites/$url/files/private/config/active"] = d('@server_master')->web_group;
$mkdir["sites/$url/files/private/config/staging"] = 02770;
$chgrp["sites/$url/files/private/config/staging"] = d('@server_master')->web_group;
$mkdir["sites/$url/private/config/staging"] = 02770;
$chgrp["sites/$url/private/config/staging"] = d('@server_master')->web_group;
}
// These paths should not have recursive operations performed on them.
......@@ -268,9 +265,9 @@ function _provision_drupal_create_directories($url = NULL, $profile = NULL) {
"sites/$url/private/temp",
"sites/$url/files/styles",
"sites/$url/files/private",
"sites/$url/files/private/config",
"sites/$url/files/private/config/active",
"sites/$url/files/private/config/staging"
"sites/$url/private/config",
"sites/$url/private/config/active",
"sites/$url/private/config/staging"
);
// Allow other commands to add or alter the directories to be created.
......@@ -532,7 +529,7 @@ function _provision_find_platforms() {
return array(
'drupal' => array(
'short_name' => 'drupal', 'version' => drush_drupal_version(),
'description' => dt("This platform is running @short_name @version", array('@short_name' => 'Drupal', '@version' => VERSION))));
'description' => dt("This platform is running @short_name @version", array('@short_name' => 'Drupal', '@version' => drush_drupal_version()))));
}
/**
......
platform/provision_welcome_mail.inc
View file @ 3b8ff33b
......@@ -9,9 +9,15 @@
*/
$mail = array();
$mail['subject'] = st('Your new site !site has been created.');
$mail['body'] = st("!username,
if (drush_drupal_major_version() >= 8) {
$t = 't';
}
else {
$t = 'st';
}
$mail['subject'] = $t('Your new site !site has been created.');
$mail['body'] = $t("!username,
Your new site !site has been created.
......
platform/reset.login.provision.inc
View file @ 3b8ff33b
......@@ -31,6 +31,10 @@ function drush_provision_drupal_provision_login_reset() {
drush_set_option('login_link', $onetime);
drush_log(t('Login url: !onetime', array('!onetime' => $onetime)), 'success');
if (drush_drupal_major_version() >= 8) {
require_once 'core/includes/session.inc';
}
if (drush_drupal_major_version() >= 7) {
drupal_session_destroy_uid(1);
}
......
platform/verify.provision.inc
View file @ 3b8ff33b
......@@ -76,7 +76,7 @@ function drush_provision_drupal_pre_provision_verify() {
->fail('Drupal sites directory @path is not writable by the provisioning script', 'PROVISION_SITES_DIR_NOT_WRITABLE');
drush_set_option('sites', array_keys((array) provision_drupal_find_sites()), 'drupal');
drush_log(dt("This platform is running @short_name @version", array('@short_name' => 'drupal', '@version' => VERSION)));
drush_log(dt("This platform is running @short_name @version", array('@short_name' => 'drupal', '@version' => drush_drupal_version())));
drush_set_option('packages', _scrub_object(provision_find_packages()), 'drupal');
provision_drupal_push_site();
}
......