Skip to content
Snippets Groups Projects
Commit 38721998 authored by GitLab CI's avatar GitLab CI
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !93
parents 7e13966d 1c383e41
No related branches found
No related tags found
1 merge request!93Merging develop into main
Pipeline #1180106 passed
......@@ -6,8 +6,8 @@ commands:
drush @default.dev cr
SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
if [[ "$SPLIT" != "[]" ]]; then
drush -y @default.dev config-split:deactivate live --force
drush -y @default.dev config-split:deactivate test --force
drush -y @default.dev config-split:deactivate live --override
drush -y @default.dev config-split:deactivate test --override
drush -y @default.dev config-split:import develop
fi
download files ${PROJECT_BRANCH}
......@@ -20,8 +20,8 @@ commands:
drush @default.dev cr
SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
if [[ "$SPLIT" != "[]" ]]; then
drush -y @default.dev config-split:deactivate live --force
drush -y @default.dev config-split:deactivate test --force
drush -y @default.dev config-split:deactivate live --override
drush -y @default.dev config-split:deactivate test --override
drush -y @default.dev config-split:import develop
fi
usage: Pull DB from live site
......
......@@ -6,8 +6,8 @@ commands:
drush @default.dev cr
SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
if [[ "$SPLIT" != "[]" ]]; then
drush -y @default.dev config-split:deactivate live --force
drush -y @default.dev config-split:deactivate test --force
drush -y @default.dev config-split:deactivate live --override
drush -y @default.dev config-split:deactivate test --override
drush -y @default.dev config-split:import develop
fi
download files main
......@@ -20,8 +20,8 @@ commands:
drush @default.dev cr
SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
if [[ "$SPLIT" != "[]" ]]; then
drush -y @default.dev config-split:deactivate live --force
drush -y @default.dev config-split:deactivate test --force
drush -y @default.dev config-split:deactivate live --override
drush -y @default.dev config-split:deactivate test --override
drush -y @default.dev config-split:import develop
fi
usage: Pull DB from live site
......
......@@ -360,7 +360,7 @@ class Handler extends BaseHandler {
}
$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',
'command' => 'cd /var/www/html && /var/www/html/vendor/bin/drush sql:dump --result-file=/var/backups/mysql/drupal.sql',
];
$crontabs['enable'] = TRUE;
$crontabs['enable_mysql_backup'] = TRUE;
......
......@@ -5,6 +5,6 @@ tty = true
user = {{ line.user }}
schedule = {{ line.schedule }}
container = {{ projectname }}-php-1
command = sh -c \"{{ line.command|raw }}{% if line.ping_url %} && curl -fsS --retry 5 --retry-delay 9 -o /dev/null {{ line.ping_url }}{% endif %}\"
command = sh -c \"{{ line.command|raw|replace({'/usr/local/bin/drush': '/var/www/html/vendor/bin/drush'}) }}{% if line.ping_url %} && curl -fsS --retry 5 --retry-delay 9 -o /dev/null {{ line.ping_url }}{% endif %}\"
{% endfor %}
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