Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature branching pr 1.x #528

Merged
merged 35 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
09a6e98
Adding syncing for feature branches.
gregharvey Aug 10, 2023
fee7ee1
Cannot loop over import_role, changing for include_role.
gregharvey Aug 10, 2023
68d08f3
Merge branch '1.x' into feature_branching-PR-1.x
gregharvey Aug 10, 2023
24fb0fb
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Aug 10, 2023
4492396
Merge branch '1.x' into feature_branching
gregharvey Aug 11, 2023
4f0e5f5
Adding ability to specify an exact filename for a settings template f…
gregharvey Aug 11, 2023
88fdaf3
Merge branch '1.x' into feature_branching-PR-1.x
gregharvey Aug 11, 2023
0d880ee
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Aug 11, 2023
ce534be
Merging 1.x
gregharvey Jul 19, 2024
42e8c1f
First pass at NGINX vhost handling in ce-deploy.
gregharvey Jul 19, 2024
c469f1a
Merging 1.x
gregharvey Jul 19, 2024
8eb264a
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Jul 19, 2024
edb30c9
Adding in the SSL role from ce-provision.
gregharvey Jul 19, 2024
41f33d5
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Jul 19, 2024
9ac0221
Fixing role paths and ensuring NGINX ssl.yml is available.
gregharvey Jul 19, 2024
30c8d47
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Jul 19, 2024
ca9fc27
Fixing NGINX role location.
gregharvey Jul 19, 2024
71dc27d
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Jul 19, 2024
0841be4
Tweaking location of domain.yml so it loads the templates correctly.
gregharvey Jul 19, 2024
13c6bde
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Jul 19, 2024
a74bf8f
Merge branch '1.x' into feature_branching
gregharvey Dec 30, 2024
0c26759
Moving the Drupal 8 cron job to a file.
gregharvey Dec 30, 2024
668de0f
Merge branch '1.x' of github.com:codeenigma/ce-deploy into feature_br…
gregharvey Dec 30, 2024
4aba6a9
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Dec 30, 2024
5f90bda
Merge branch '1.x' into feature_branching
gregharvey Jan 14, 2025
048a0fc
Merge branch '1.x' of github.com:codeenigma/ce-deploy into feature_br…
gregharvey Jan 14, 2025
b3a589f
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Jan 14, 2025
bae172f
Merge branch '1.x' into feature_branching
gregharvey Jan 16, 2025
081b2e5
Making cron_file optional.
gregharvey Jan 16, 2025
1fd3d23
Merge branch '1.x' of github.com:codeenigma/ce-deploy into feature_br…
gregharvey Jan 16, 2025
3ecc45f
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Jan 16, 2025
5e61b38
Fixing example cron file path.
gregharvey Jan 16, 2025
b2f0db4
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Jan 16, 2025
aa7b163
Adding a 'become' to creating cron files for sudo.
gregharvey Jan 16, 2025
971c28c
Merge branch 'feature_branching' into feature_branching-PR-1.x
gregharvey Jan 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions roles/cron/cron_drupal8/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ drupal:
job: cron
# disabled: true
# mailto: "{{ drupal.cron_mailto | default('') }}" # Each cron can have it's own mailto and can be configured to use different e-mail addresses.
# file: "/etc/cron.d/{{ project_name }}_{{ build_type }}_job_name" # edit job_name and uncomment to create a file for cron - note, deploy user needs to be able to write to the location
cron_mailto: ""
# 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.
defer: false
Expand Down
3 changes: 1 addition & 2 deletions roles/cron/cron_drupal8/tasks/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@
with_items: "{{ site.cron }}"
loop_control:
loop_var: entry
when:
- (deploy_operation == "deploy") or (deploy_operation == "revert")
when: deploy_operation == "deploy"
4 changes: 3 additions & 1 deletion roles/cron/cron_drupal8/tasks/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
- name: Define cron job command.
ansible.builtin.set_fact:
_cron_job_command: "cd {{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }} && {{ drupal.drush_location }} {{ entry.job }} >/dev/null"
when: deploy_operation == "deploy"

- name: Define cron job command if deferred (ASG).
ansible.builtin.set_fact:
Expand Down Expand Up @@ -43,4 +42,7 @@
{{ _cron_job_command | trim }}
state: present
disabled: "{{ entry.disabled | default(omit) }}"
cron_file: "{{ entry.file | default(omit) }}"
user: "{{ www_user }}"
delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
become: "{{ true if entry.file is defined else false }}"
Loading