Skip to content

Commit dd530bb

Browse files
authored
Updating-cron-path-fixing-mailto (#508)
* Updating-cron-path-fixing-mailto * Adding-md * Using-cronvar-module * Fixing-linting-condition * Adding-mailto-dynamically-for-specific-jobs * Fixing-incorrect-crontab-entries * Updating-condition-for-crons * Updating-condition-for-crons * Updating-condition-for-crons * Updating-condition-for-crons * Updating-condition-for-crons * Updating-condition-for-crons * Updating-cron-path-fixing-mailto * Updating-cron-path-fixing-mailto * Updating-cron-path-fixing-mailto * Mailto-filtering * Polishing-cron-output * Fixing-syntax * Filtering-test-crons-mailto * Testing-trim-jinja * Cronjob-path-fix * Reverting
1 parent ad3165c commit dd530bb

File tree

13 files changed

+52
-15
lines changed

13 files changed

+52
-15
lines changed

docs/_Sidebar.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- [Matomo](/roles/cache_clear/cache_clear-matomo)
1111
- [Drupal 8](/roles/cache_clear/cache_clear-mautic)
1212
- [Opcache](/roles/cache_clear/cache_clear-opcache)
13+
- [Symfony](/roles/cache_clear/cache_clear-symfony)
1314
- [ce-dev](/roles/ce_dev)
1415
- [ce-dev prebuild](/roles/ce_dev/ce_dev_prebuild)
1516
- [CLI Tools](/roles/cli)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Symfony
2+
Clears the Symfony application cache.
3+
<!--TOC-->
4+
<!--ENDTOC-->
5+
6+
<!--ROLEVARS-->
7+
## Default variables
8+
```yaml
9+
---
10+
cache_clear_symfony_env: prod
11+
12+
```
13+
14+
<!--ENDROLEVARS-->

docs/roles/cron/cron_drupal7.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ drupal:
2424
# If defer is set to true, the Ansible target must be declared with defer_target. If using a group, include the index. For example, _ce_www_dev[0]
2525
defer_target: ""
2626
drush_location: "{{ drush_bin }}" # you might specify another location, e.g. "{{ deploy_path }}/vendor/bin/drush"
27+
2728
```
2829

2930
<!--ENDROLEVARS-->

docs/roles/deploy_code.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,15 @@ Deploying code with autoscaling clusters relies on [cloud-init](https://cloudini
8585
## Default variables
8686
```yaml
8787
---
88+
# Required for NGINX config in feature branching.
89+
_ce_provision_data_dir: /home/deploy/ce-deploy/data
90+
8891
deploy_code:
92+
# Feature branching config.
93+
feature_branch:
94+
enabled: false
95+
# NGINX domains to build, see ce-provision for docs: https://github.com/codeenigma/ce-provision/blob/2.x/roles/debian/nginx/defaults/main.yml#L133
96+
domains: []
8997
# Specify any additional symlink to create, with src (target) and dest (link).
9098
# src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig')
9199
# dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache')

docs/roles/sync/database_sync/database_sync-mysql.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ mysql_sync:
2525
credentials_file: "/home/{{ deploy_user }}/.mysql.creds"
2626
# This can be of types:
2727
# - rolling: (database backups). In that case we'll need build parameters.@todo
28-
# - fixed: "fixed" database name
28+
# - fixed: "fixed" database name # currently this var means the same as "dump"
2929
# - dump: Use an existing dump. In that case, the "database" variable is the absolute file path.
30+
# This parameter is ignored if var 'path_on_deploy_server' is defined.
3031
type: fixed
3132
# For "rolling builds", so we can compute the database name.
3233
build_id: mybuildprod
@@ -37,6 +38,9 @@ mysql_sync:
3738
dumps_directory: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/db_backups/mysql/regular"
3839
# If the source is on an ASG, provide the ASG name here. Otherwise, leave empty.
3940
asg: ""
41+
# Uncomment and specify full path if you want to use your own dump file on the deploy server (gzip compressed).
42+
# In this case it's the only variable you need in 'database.source'.
43+
#path_on_deploy_server: "/home/{{ deploy_user }}/compressed_database_dump.gz"
4044
target:
4145
database: "{{ project_name }}_dev"
4246
credentials_file: "/home/{{ deploy_user }}/.mysql.creds"

roles/cache_clear/cache_clear-symfony/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,11 @@ Clears the Symfony application cache.
44
<!--ENDTOC-->
55

66
<!--ROLEVARS-->
7+
## Default variables
8+
```yaml
9+
---
10+
cache_clear_symfony_env: prod
11+
12+
```
13+
714
<!--ENDROLEVARS-->

roles/cron/cron_drupal7/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ drupal:
2424
# If defer is set to true, the Ansible target must be declared with defer_target. If using a group, include the index. For example, _ce_www_dev[0]
2525
defer_target: ""
2626
drush_location: "{{ drush_bin }}" # you might specify another location, e.g. "{{ deploy_path }}/vendor/bin/drush"
27+
2728
```
2829

2930
<!--ENDROLEVARS-->

roles/cron/cron_drupal7/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ drupal:
1212
# month:
1313
job: cron
1414
# disabled: true
15-
mailto: "{{ drupal.cron_mailto | default('') }}"
16-
cron_mailto: ""
1715
# If the sites are being deployed to an ASG, setting defer to true will create the crontab entry on the deploy server rather than all of the app servers.
1816
defer: false
1917
# If defer is set to true, the Ansible target must be declared with defer_target. If using a group, include the index. For example, _ce_www_dev[0]

roles/cron/cron_drupal7/tasks/job.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: Define cron job command.
33
ansible.builtin.set_fact:
4-
_cron_job_command: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drupal.drush_location }} {{ entry.job }}"
4+
_cron_job_command: "cd {{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }} && {{ drupal.drush_location }} {{ entry.job }}"
55

66
- name: Define cron job command if deferred (ASG).
77
ansible.builtin.set_fact:
@@ -31,5 +31,4 @@
3131
job: "{{ _cron_job_command }}"
3232
state: present
3333
disabled: "{{ entry.disabled | default(omit) }}"
34-
mailto: "{{ entry.mailto if entry.mailto is defined else omit }}"
3534
delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"

roles/cron/cron_drupal8/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ drupal:
1212
# month:
1313
job: cron
1414
# disabled: true
15-
mailto: "{{ drupal.cron_mailto | default('') }}"
16-
cron_mailto: ""
1715
# If the sites are being deployed to an ASG, setting defer to true will create the crontab entry on the deploy server rather than all of the app servers.
1816
defer: false
1917
# If defer is set to true, the Ansible target must be declared with defer_target. If using a group, include the index. For example, _ce_www_dev[0]

0 commit comments

Comments
 (0)