Skip to content
Snippets Groups Projects
Commit 8727bd7a authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !19
parents 4d5a9f7d 27c7a996
No related branches found
No related tags found
1 merge request!19Merging develop into main
Pipeline #524993 passed
......@@ -8,14 +8,20 @@
"authors": [
{
"name": "Jürgen Haas",
"email": "juergen@paragon-es.de",
"homepage": "https://www.paragon-es.de",
"email": "juergen.haas@lakedrops.com",
"homepage": "https://www.lakedrops.com",
"role": "Drupal Expert"
},
{
"name": "Daniel Speicher",
"email": "daniel.speicher@lakedrops.com",
"homepage": "https://www.lakedrops.com",
"role": "Drupal Expert"
},
{
"name": "Richard Papp",
"email": "richard.papp@boromino.com",
"homepage": "http://www.boromino.com",
"email": "richard.papp@lakedrops.com",
"homepage": "https://www.lakedrops.com",
"role": "Drupal Expert"
}
],
......@@ -35,8 +41,10 @@
},
"require-dev": {
"composer/composer": "^1||^2",
"drupal/coder": "^8.3",
"lakedrops/drupal-environment": "^3.0",
"phpunit/phpunit": "^8.4"
"phpunit/phpunit": "^8.4",
"roave/security-advisories": "dev-latest"
},
"minimum-stability": "dev",
"prefer-stable": true,
......
......@@ -251,13 +251,10 @@ class Handler extends BaseHandler {
$traefik['usessl'] = 1;
$traefik['ports'] = 443;
$crontabs = $this->config->readValue('crontabs');
if ($this->config->readValue(['backup', 'enable'])) {
$crontabs['www-data']['MySQL backup'] = [
'schedule' => '5 0 * * *',
'command' => 'cd /var/www/html && /usr/local/bin/drush sql:dump --result-file=/var/backups/mysql/drupal.sql',
];
}
$crontabs['enable'] = (array_sum(array_map('count', $crontabs)) > 0);
$crontabs['www-data']['MySQL backup'] = [
'schedule' => '5 0 * * *',
'command' => 'cd /var/www/html && /usr/local/bin/drush sql:dump --result-file=/var/backups/mysql/drupal.sql',
];
$this->config->setValue('crontabs', $crontabs, FALSE);
$overwriteConfig = [
'staging' => !in_array(getenv('PROJECT_BRANCH_SANITIZED'), ['master', 'main'], TRUE),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment