Skip to content

Commit b01f5e7

Browse files
gregharveynfawbertDionisioFGdavids4David Suissa
authored
Improved defaults pr devel (#181)
* Fix docker-compose v2 issue and re-release to include clamav role (#68) * Killing old ce-dev container when updating (#70) * Added Drupal9 and Localgov templates (#73) * New release 1.1.19 (#75) * Updated package.json version: 1.1.19 (#77) * Updated package.json version: 1.1.19 * New tag to fix repo key for Chrome (#83) * #CE-62820: Added support for composer '2.x' in Drupal 9 provision tem… (#89) (#91) * #CE-62820: Added support for composer '2.x' in Drupal 9 provision template. * #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'new_user' in provision. * #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'key_name' in provision. * #CE-62820: Attempt to fix pull request test cases by providing a default values for 'ce_deploy' in provision. Co-authored-by: David Suissa <david.suissa@codeenigma.com> Co-authored-by: David Suissa <david.suissa@codeenigma.com> * REL 1.1.21: Using composer 2 with Drupal 9 by default (#92) * Drupal template fixes pr 1.x (#94) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * CE-DEV: some updates and tweaks (#96) * Renamed the settings and drush files for ce-dev * Added nodejs 16.x as default version * Added lhci_run role by default * Some tweaks in the config * Added the if statement to read info from an optional settings.local.php file * Release 1.1.23 (#97) * Bump minimist from 1.2.5 to 1.2.6 (#79) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ansi-regex from 3.0.0 to 3.0.1 (#84) Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](chalk/ansi-regex@v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: ansi-regex dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump moment from 2.27.0 to 2.29.4 (#85) Bumps [moment](https://github.com/moment/moment) from 2.27.0 to 2.29.4. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](moment/moment@2.27.0...2.29.4) --- updated-dependencies: - dependency-name: moment dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Changing 'set-current' choice to a valid one. * Fixing ce_provision vars in container builds. (#102) * Adding variables pr 1.x (#104) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding variables pr 1.x (#106) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding the option to build manually the containers. * Adding variables pr 1.x (#109) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding the option to build manually the containers. * Still missing some vars. * Adding variables pr 1.x (#111) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding the option to build manually the containers. * Still missing some vars. * Setting older version of Ubuntu for containers. * Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' parameter. * Bump minimatch from 3.0.4 to 3.1.2 (#107) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Cgroup fixes pr 1.x (#115) * Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' parameter. * Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' parameter. (#113) * Documentation update for docker composer v2. * Temporarily disabling LHCI for Drupal 9 due to an HTML issue. * Preparing release of 1.2.0. * Updating release version in package.json. * Updating yarn dependencies. * Committing package-lock.json (new file with newer node versions). * Revert "Committing package-lock.json (new file with newer node versions)." This reverts commit 8912d3d. * Revert "Updating yarn dependencies." This reverts commit 94be4ab. --------- Co-authored-by: Kristjan Lilleoja <kristjan.lilleoja@yumuuv.com> Co-authored-by: Kristjan Lilleoja <kristjanlilleoja@me.com> * Adding new required ce-provision rkhunter variable. (#119) * Issue 120: docker ps change, can no longer use --format *and* --quiet. (#122) * REL 1.2.1: Fix --quiet and --format use (#123) * Drupal template fixes pr 1.x (#126) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. * Suppressing unattended-upgrades. * Adding composer plugins to Drupal 8 deployments. * Adding the phpcodesniffer plugin for D8. * Bump semver from 5.7.1 to 5.7.2 (#124) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * Bump semver from 5.7.1 to 5.7.2 Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](npm/node-semver@v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: gregharvey <greg.harvey@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Updating docs URL for CI to https. (#131) * Drupal template fixes pr 1.x (#133) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. * Suppressing unattended-upgrades. * Adding composer plugins to Drupal 8 deployments. * Adding the phpcodesniffer plugin for D8. * Updating PHP versions for templates. * Drupal template fixes pr 1.x (#135) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. * Suppressing unattended-upgrades. * Adding composer plugins to Drupal 8 deployments. * Adding the phpcodesniffer plugin for D8. * Updating PHP versions for templates. * Downgrading Drupal and drush for LGD. * Drupal template fixes pr 1.x (#138) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. * Suppressing unattended-upgrades. * Adding composer plugins to Drupal 8 deployments. * Adding the phpcodesniffer plugin for D8. * Updating PHP versions for templates. * Downgrading Drupal and drush for LGD. * LGD prebuilt template needs to use drupal9 images. * Packaging 1.2.2 with new Drupal templates. * Drupal template fixes pr 1.x (#140) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. * Suppressing unattended-upgrades. * Adding composer plugins to Drupal 8 deployments. * Adding the phpcodesniffer plugin for D8. * Updating PHP versions for templates. * Downgrading Drupal and drush for LGD. * LGD prebuilt template needs to use drupal9 images. * Adding another composer plugin for LGD template builds. * Upgrading base container to bullseye-slim. (#141) * Adding release info. * 66912: Added Drupal10 template (#144) * 66912: Added Drupal10 template * 66912: Added post_tasks section * 66912: Updated version to 1.2.4 * 66912: Recovered drupal8 * 66912: Fixed drupal10 text * Bump word-wrap from 1.2.3 to 1.2.4 (#136) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Troubleshooting.md to include more information around cgroup. (#145) * Bump debug from 4.1.1 to 4.3.4 (#146) Bumps [debug](https://github.com/debug-js/debug) from 4.1.1 to 4.3.4. - [Release notes](https://github.com/debug-js/debug/releases) - [Commits](debug-js/debug@4.1.1...4.3.4) --- updated-dependencies: - dependency-name: debug dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * #60168: Documentation: Updated Troubleshooting information for 'Ubuntu:22.x'. (#99) Co-authored-by: David Suissa <david.suissa@codeenigma.com> Co-authored-by: gregharvey <greg.harvey@gmail.com> * Bullseye upgrade pr 1.x (#147) * Upgrading base container to bullseye-slim. * Noticed some extra references to buster. * Adding build for testing images from devel. (#149) * Allow branch switching pr 1.x (#167) * Creating devel containers with Debian 'bookworm' (12). * Moving ansible and boto3 installs to apt. * apt installed ansible is not in /usr/local. * Updating dependencies. * Updating yarn.lock again. * Fixing ansible paths for ce-provision 2.x. * Adding new variables required by controller. * Installing ansible in a virtual environment on the container before running ce-provision. * Missing a slash! * Also missed a &&. * Adding python venv support via apt in base image. * Temporarily adding python3-venv to the controller Dockerfile. * Installing Ansible as the ce-dev user to avoid perms issues. * Upgrading ubuntu in CI to have systemd as default and disabling Ansible upgrades. * Missing an ansible install var. * Documentation for testing containers. * Adding vscode settings to .gitignore. * Adding devel versions of Dockerfiles and config. * Fixing bug caused by set line. * Updating CI for export.sh changes. * Adding ability to switch ce-provision own branch and config branch. * Restoring the 1.x branch. * Missed a couple of 2.x references. * Updating yarn.lock again. * Do not base off the unison container. * Fixing 1.x Ansible installation. * Merging 1.x. (#172) * Add ansible verbose pr 1.x (#174) * Merging 1.x. * Getting rid of bookworm in 1.x because Ansible cannot install on it. * Missing paths to Dockerfile in some CI jobs. * Fixing vars formatting and adding PHP-FPM support for xdebug. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: nfawbert <62660788+nfawbert@users.noreply.github.com> Co-authored-by: Dionisio <dionisiofernandez83@gmail.com> Co-authored-by: davids4 <35807961+davids4@users.noreply.github.com> Co-authored-by: David Suissa <david.suissa@codeenigma.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kristjan Lilleoja <kristjan.lilleoja@yumuuv.com> Co-authored-by: Kristjan Lilleoja <kristjanlilleoja@me.com> Co-authored-by: Dan Smith <dan.smith@codeenigma.com> Co-authored-by: Philip Norton <philipnorton42@gmail.com>
1 parent 526171b commit b01f5e7

File tree

3 files changed

+153
-150
lines changed

3 files changed

+153
-150
lines changed

templates/drupal10/ce-dev/ansible/provision.yml.j2

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,60 @@
11
- hosts: {{ project_name }}-web
22
become: true
33
vars:
4-
- _domain_name: www.{{ project_name }}.local
5-
- _env_type: dev
6-
- project_name: {{ project_name }}
7-
- rkhunter:
8-
allow_ssh_root_user: prohibit-password
9-
- mysql_client:
10-
host: {{ project_name }}-db
11-
user: root
12-
password: ce-dev
4+
_domain_name: www.{{ project_name }}.local
5+
_env_type: dev
6+
project_name: {{ project_name }}
7+
rkhunter:
8+
allow_ssh_root_user: prohibit-password
9+
mysql_client:
10+
host: {{ project_name }}-db
11+
user: root
12+
password: ce-dev
1313
{% raw %}
14-
- nginx:
15-
domains:
16-
- server_name: "{{ _domain_name }}"
17-
access_log: "/var/log/nginx-access.log"
18-
error_log: "/var/log/nginx-error.log"
19-
error_log_level: "notice"
20-
webroot: "/home/ce-dev/deploy/live.local/web"
21-
project_type: "drupal8"
22-
ssl:
23-
domain: "{{ _domain_name }}"
24-
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25-
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26-
handling: "unmanaged"
27-
ratelimitingcrawlers: false
28-
is_default: true
29-
servers:
30-
- port: 80
31-
ssl: false
32-
https_redirect: true
33-
- port: 443
34-
ssl: true
35-
https_redirect: false
36-
upstreams: []
37-
- php:
38-
version:
39-
- 8.1
40-
cli:
41-
memory_limit: -1
42-
_env_type: dev
43-
fpm:
44-
_env_type: dev
45-
- php_composer:
46-
version: ''
47-
version_branch: '--2'
48-
keep_updated: true
49-
- xdebug:
50-
cli: true
51-
- lhci:
52-
enable_vnc: true
53-
- nodejs:
54-
version: 18.x
55-
- apt_unattended_upgrades:
56-
enable: false
14+
nginx:
15+
domains:
16+
- server_name: "{{ _domain_name }}"
17+
access_log: "/var/log/nginx-access.log"
18+
error_log: "/var/log/nginx-error.log"
19+
error_log_level: "notice"
20+
webroot: "/home/ce-dev/deploy/live.local/web"
21+
project_type: "drupal8"
22+
ssl:
23+
domain: "{{ _domain_name }}"
24+
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25+
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26+
handling: "unmanaged"
27+
ratelimitingcrawlers: false
28+
is_default: true
29+
servers:
30+
- port: 80
31+
ssl: false
32+
https_redirect: true
33+
- port: 443
34+
ssl: true
35+
https_redirect: false
36+
upstreams: []
37+
php:
38+
version:
39+
- 8.1
40+
cli:
41+
memory_limit: -1
42+
_env_type: dev
43+
fpm:
44+
_env_type: dev
45+
php_composer:
46+
version: ''
47+
version_branch: '--2'
48+
keep_updated: true
49+
xdebug:
50+
cli: true
51+
fpm: true
52+
lhci:
53+
enable_vnc: true
54+
nodejs:
55+
version: 18.x
56+
apt_unattended_upgrades:
57+
enable: false
5758
{% endraw %}
5859
tasks:
5960
- ansible.builtin.apt:

templates/drupal8/ce-dev/ansible/provision.yml.j2

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,54 @@
11
- hosts: {{ project_name }}-web
22
become: true
33
vars:
4-
- _domain_name: www.{{ project_name }}.local
5-
- _env_type: dev
6-
- project_name: {{ project_name }}
7-
- rkhunter:
8-
allow_ssh_root_user: prohibit-password
9-
- mysql_client:
10-
host: {{ project_name }}-db
11-
user: root
12-
password: ce-dev
4+
_domain_name: www.{{ project_name }}.local
5+
_env_type: dev
6+
project_name: {{ project_name }}
7+
rkhunter:
8+
allow_ssh_root_user: prohibit-password
9+
mysql_client:
10+
host: {{ project_name }}-db
11+
user: root
12+
password: ce-dev
1313
{% raw %}
14-
- nginx:
15-
domains:
16-
- server_name: "{{ _domain_name }}"
17-
access_log: "/var/log/nginx-access.log"
18-
error_log: "/var/log/nginx-error.log"
19-
error_log_level: "notice"
20-
webroot: "/home/ce-dev/deploy/live.local/web"
21-
project_type: "drupal8"
22-
ssl:
23-
domain: "{{ _domain_name }}"
24-
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25-
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26-
handling: "unmanaged"
27-
ratelimitingcrawlers: false
28-
is_default: true
29-
servers:
30-
- port: 80
31-
ssl: false
32-
https_redirect: true
33-
- port: 443
34-
ssl: true
35-
https_redirect: false
36-
upstreams: []
37-
- php:
38-
version:
39-
- 7.4
40-
cli:
41-
memory_limit: -1
42-
_env_type: dev
43-
fpm:
44-
_env_type: dev
45-
- xdebug:
46-
cli: true
47-
- lhci:
48-
enable_vnc: true
49-
- apt_unattended_upgrades:
50-
enable: false
14+
nginx:
15+
domains:
16+
- server_name: "{{ _domain_name }}"
17+
access_log: "/var/log/nginx-access.log"
18+
error_log: "/var/log/nginx-error.log"
19+
error_log_level: "notice"
20+
webroot: "/home/ce-dev/deploy/live.local/web"
21+
project_type: "drupal8"
22+
ssl:
23+
domain: "{{ _domain_name }}"
24+
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25+
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26+
handling: "unmanaged"
27+
ratelimitingcrawlers: false
28+
is_default: true
29+
servers:
30+
- port: 80
31+
ssl: false
32+
https_redirect: true
33+
- port: 443
34+
ssl: true
35+
https_redirect: false
36+
upstreams: []
37+
php:
38+
version:
39+
- 7.4
40+
cli:
41+
memory_limit: -1
42+
_env_type: dev
43+
fpm:
44+
_env_type: dev
45+
xdebug:
46+
cli: true
47+
fpm: true
48+
lhci:
49+
enable_vnc: true
50+
apt_unattended_upgrades:
51+
enable: false
5152
{% endraw %}
5253
pre_tasks:
5354
# Debian has nodejs 12.x installed by default.

templates/drupal9/ce-dev/ansible/provision.yml.j2

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,60 @@
11
- hosts: {{ project_name }}-web
22
become: true
33
vars:
4-
- _domain_name: www.{{ project_name }}.local
5-
- _env_type: dev
6-
- project_name: {{ project_name }}
7-
- rkhunter:
8-
allow_ssh_root_user: prohibit-password
9-
- mysql_client:
10-
host: {{ project_name }}-db
11-
user: root
12-
password: ce-dev
4+
_domain_name: www.{{ project_name }}.local
5+
_env_type: dev
6+
project_name: {{ project_name }}
7+
rkhunter:
8+
allow_ssh_root_user: prohibit-password
9+
mysql_client:
10+
host: {{ project_name }}-db
11+
user: root
12+
password: ce-dev
1313
{% raw %}
14-
- nginx:
15-
domains:
16-
- server_name: "{{ _domain_name }}"
17-
access_log: "/var/log/nginx-access.log"
18-
error_log: "/var/log/nginx-error.log"
19-
error_log_level: "notice"
20-
webroot: "/home/ce-dev/deploy/live.local/web"
21-
project_type: "drupal8"
22-
ssl:
23-
domain: "{{ _domain_name }}"
24-
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25-
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26-
handling: "unmanaged"
27-
ratelimitingcrawlers: false
28-
is_default: true
29-
servers:
30-
- port: 80
31-
ssl: false
32-
https_redirect: true
33-
- port: 443
34-
ssl: true
35-
https_redirect: false
36-
upstreams: []
37-
- php:
38-
version:
39-
- 8.0
40-
cli:
41-
memory_limit: -1
42-
_env_type: dev
43-
fpm:
44-
_env_type: dev
45-
- php_composer:
46-
version: ''
47-
version_branch: '--2'
48-
keep_updated: true
49-
- xdebug:
50-
cli: true
51-
- lhci:
52-
enable_vnc: true
53-
- nodejs:
54-
version: 16.x
55-
- apt_unattended_upgrades:
56-
enable: false
14+
nginx:
15+
domains:
16+
- server_name: "{{ _domain_name }}"
17+
access_log: "/var/log/nginx-access.log"
18+
error_log: "/var/log/nginx-error.log"
19+
error_log_level: "notice"
20+
webroot: "/home/ce-dev/deploy/live.local/web"
21+
project_type: "drupal8"
22+
ssl:
23+
domain: "{{ _domain_name }}"
24+
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25+
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26+
handling: "unmanaged"
27+
ratelimitingcrawlers: false
28+
is_default: true
29+
servers:
30+
- port: 80
31+
ssl: false
32+
https_redirect: true
33+
- port: 443
34+
ssl: true
35+
https_redirect: false
36+
upstreams: []
37+
php:
38+
version:
39+
- 8.0
40+
cli:
41+
memory_limit: -1
42+
_env_type: dev
43+
fpm:
44+
_env_type: dev
45+
php_composer:
46+
version: ''
47+
version_branch: '--2'
48+
keep_updated: true
49+
xdebug:
50+
cli: true
51+
fpm: true
52+
lhci:
53+
enable_vnc: true
54+
nodejs:
55+
version: 16.x
56+
apt_unattended_upgrades:
57+
enable: false
5758
{% endraw %}
5859
tasks:
5960
- ansible.builtin.apt:

0 commit comments

Comments
 (0)