Skip to content

Commit

Permalink
9.2.3
Browse files Browse the repository at this point in the history
- Exclude LE Cert validation url from shield module
- Fixed the cert command and the empty space
- Updated dependencies
- HSD8-1112 set tab index and empty alt for linked images in views
- Adjusted circleci containers for functional tests
- HSD8-1094 Acceptance test for photo album
- fixed cert issuing command when passing domains
- HSD8-1111 add "Full Content" for image media display
- Sparkbox Sprint 45
- STN-793:  Bug fix aligned images in wysiwyg (#929)
- STN-815: Fix placement/accessibility of contextual links on images on views (#925)
- STN-814:   Incorrect hover state on external link in the secondary menu on Colorful (#928)
- feat(STN-732): add CSS for lightbox (#927)
- STN-732:  Add Photo Album Grid Lightbox / Colorbox Styles (#920)
- feat: update visual regression documentation to include instructions on preparing your local environment for running tests (#921)
- Disable colorbox token unique
- HSD8-1101: Provision sociology (#930)
- Fixed additional cert issue
- Fixed dev and stage cert commands
- HSD8-1107 Updated default content
- Fixed responsive styles for photo album grid
- Updated dependencies Jul 21 2021
  • Loading branch information
pookmish authored Aug 4, 2021
2 parents 66d8a66 + 4e52323 commit b7f75f1
Show file tree
Hide file tree
Showing 45 changed files with 5,258 additions and 221 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ add_known_hosts: &add_known_hosts
defaults: &defaults
docker:
- image: pookmish/drupal8ci:latest
- image: selenium/standalone-chrome:latest
- image: selenium/standalone-chrome:3.141.59-20210713
- image: circleci/mysql:5.7
environment:
MYSQL_DATABASE: drupal
Expand Down
2 changes: 2 additions & 0 deletions blt/blt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ multisites:
- francestanford
- gavin_wright__humsci
- gus_humsci
- gus_humsci2021
- heidi_williams__humsci
- history
- hs_colorful
Expand Down Expand Up @@ -126,6 +127,7 @@ multisites:
- researchadmin_humsci
- shenlab
- siw
- sociology
- southasia
- sparkbox_sandbox
- stanfordsciencefellows
Expand Down
14 changes: 9 additions & 5 deletions blt/src/Blt/Plugin/Commands/HsCertCommands.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,12 @@ public function deleteOldBackups() {
* @throws \Robo\Exception\TaskException
*/
public function humsciLetsEncryptAdd($environment, $options = [
'domains' => [],
'domains' => '',
'skip-check' => FALSE,
'force' => FALSE,
]) {
$options['domains'] = array_filter(explode(',', $options['domains']));

if (!in_array($environment, ['dev', 'test', 'prod'])) {
$this->say('invalid environment');
return;
Expand Down Expand Up @@ -98,7 +101,7 @@ public function humsciLetsEncryptAdd($environment, $options = [
$directory = "/mnt/gfs/humscigryphon.$environment/tmp";

$ssh_url = $this->getSshUrl($environment);
$command = sprintf('ssh %s "~/.acme.sh/acme.sh --issue %s -w %s --force --debug"', $ssh_url, $domains, $directory);
$command = sprintf('ssh %s "~/.acme.sh/acme.sh --issue %s -w %s %s --debug"', $ssh_url, $domains, $directory, $options['force'] ? '--force' : '');
return $this->taskExec($command)->run();
}

Expand Down Expand Up @@ -139,16 +142,16 @@ public function humsciLetsEncryptList($environment = 'dev') {

$shell_command = "cd ~ && .acme.sh/acme.sh --list --listraw";
$php_command = "return shell_exec('$shell_command');";
$domain_environment = str_replace('test', 'stage', $environment);
$results = $this->taskDrush()
->alias($this->getConfigValue('drush.aliases.remote'))
->alias("default.$domain_environment")
->drush('eval')
->arg($php_command)
->printOutput(FALSE)
->run();

$results = $results->getMessage();

$domain_environment = str_replace('test', 'stage', $environment);
$matches = preg_grep("/^.*-$domain_environment.*/", explode("\n", $results));
$cert = reset($matches);
preg_match_all("/[a-z].*?\.edu/", $cert, $domains);
Expand All @@ -170,8 +173,9 @@ public function humsciLetsEncryptList($environment = 'dev') {
public function updateCert($environment) {
$cert_name = $environment == 'test' ? 'swshumsci-stage.stanford.edu' : "swshumsci-$environment.stanford.edu";
$this->taskDeleteDir($this->getConfigValue('repo.root') . '/certs')->run();
$domain_environment = str_replace('test', 'stage', $environment);
$this->taskDrush()
->drush("rsync --mode=rltDkz @default.prod:/home/humscigryphon/.acme.sh/$cert_name/ @self:../certs")
->drush("rsync --mode=rltDkz @default.$domain_environment:/home/humscigryphon/.acme.sh/$cert_name/ @self:../certs")
->run();

$cert = file_get_contents($this->getConfigValue('repo.root') . "/certs/$cert_name.cer");
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,9 @@
"drupal/redirect": {
"https://www.drupal.org/project/redirect/issues/3057250": "https://www.drupal.org/files/issues/2020-12-14/validation-issue-3057250-29.patch"
},
"drupal/shield": {
"https://www.drupal.org/project/shield/issues/2822720": "https://www.drupal.org/files/issues/2021-04-19/2822720_include-exclude-pages_79.patch"
},
"drupal/simplesamlphp_auth": {
"https://www.drupal.org/project/simplesamlphp_auth/issues/2124117": "https://www.drupal.org/files/issues/2020-02-01/2124117-6-reroll-14.patch",
"https://www.drupal.org/project/simplesamlphp_auth/issues/2936889": "https://www.drupal.org/files/issues/2020-07-31/simplesamlphp_auth-avoid_unexpected_redirect-2936889-12-d8.patch"
Expand Down
Loading

0 comments on commit b7f75f1

Please sign in to comment.