Skip to content

Commit 825c693

Browse files
authored
Fixing truthy values pr 1.x (#45)
* Adding NET_ADMIN capability to target containers. * Updating all instances of 'yes' to true and 'no' to false in Ansible templates.
1 parent a27d3ce commit 825c693

File tree

9 files changed

+27
-19
lines changed

9 files changed

+27
-19
lines changed

docker-images/controller-ci/provision.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
- hosts: localhost
3-
become: yes
3+
become: true
44
vars:
55
- _domain_name: ci.example.com
66
- _ce_provision_build_tmp_dir: /tmp
77
- _ce_provision_data_dir: /tmp
8-
- is_local: yes
8+
- is_local: true
99
- _env_type: utility
1010
- ce_provision:
1111
own_repository: https://github.com/codeenigma/ce-provision.git

docker-images/controller/provision.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
- hosts: localhost
3-
become: yes
3+
become: true
44
vars:
55
- _domain_name: example.com
66
- _ce_provision_build_tmp_dir: /tmp
77
- _ce_provision_data_dir: /tmp
8-
- is_local: yes
8+
- is_local: true
99
- _env_type: utility
1010
- ce_deploy:
1111
own_repository: https://github.com/codeenigma/ce-deploy.git

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
- hosts: {{ project_name }}-{{ project_name }}
4-
become: yes
4+
become: true
55
vars:
66
- project_name: {{ project_name }}
77
- _domain_name: www.{{ project_name }}.local
@@ -10,7 +10,7 @@
1010
enable_vnc: true
1111
tasks:
1212
- apt:
13-
update_cache: yes
13+
update_cache: true
1414
- import_role:
1515
name: _meta/common_base
1616
- import_role:

templates/blank/ce-dev/ce-dev.compose.prebuilt.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ x-ce_dev:
1111
services:
1212
{{ project_name }}:
1313
image: 'codeenigma/blank-blank:latest'
14+
cap_add:
15+
- NET_ADMIN
1416
x-ce_dev:
1517
unison:
1618
- src: ../

templates/blank/ce-dev/ce-dev.compose.yml.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ x-ce_dev:
1111
services:
1212
{{ project_name }}:
1313
image: codeenigma/ce-dev-1.x:latest
14+
cap_add:
15+
- NET_ADMIN
1416
x-ce_dev:
1517
unison:
1618
- src: ../
@@ -20,4 +22,4 @@ services:
2022
- linux
2123
ignore:
2224
- Name vendor
23-
- Name node_modules
25+
- Name node_modules

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@
2727
config_sync_directory: "config/sync"
2828
sanitize_command: "sql-sanitize"
2929
# Remove after initial pass, to avoid reinstalling Drupal.
30-
force_install: yes
30+
force_install: true
3131
base_url: "https://{{ _domain_name }}"
3232
# Composer command to run.
3333
- composer:
3434
command: install
35-
no_dev: no
35+
no_dev: false
3636
working_dir: "{{ deploy_path }}"
37-
apcu_autoloader: no
37+
apcu_autoloader: false
3838
pre_tasks:
3939
# You can safely remove these steps once you have a working composer.json.
4040
- name: Download composer file.
4141
get_url:
4242
url: https://raw.githubusercontent.com/drupal/recommended-project/8.8.x/composer.json
4343
dest: "{{ deploy_path }}/composer.json"
44-
force: no
44+
force: false
4545
- name: Install drush.
4646
command:
4747
cmd: composer require drush/drush

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- hosts: {{ project_name }}-web
2-
become: yes
2+
become: true
33
vars:
44
- _domain_name: www.{{ project_name }}.local
55
- _env_type: dev
@@ -22,15 +22,15 @@
2222
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
2323
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
2424
handling: "unmanaged"
25-
ratelimitingcrawlers: no
26-
is_default: yes
25+
ratelimitingcrawlers: false
26+
is_default: true
2727
servers:
2828
- port: 80
29-
ssl: no
30-
https_redirect: yes
29+
ssl: false
30+
https_redirect: true
3131
- port: 443
32-
ssl: yes
33-
https_redirect: no
32+
ssl: true
33+
https_redirect: false
3434
upstreams: []
3535
- php:
3636
version:
@@ -47,7 +47,7 @@
4747
{% endraw %}
4848
tasks:
4949
- apt:
50-
update_cache: yes
50+
update_cache: true
5151
- import_role:
5252
name: _meta/common_base
5353
- import_role:

templates/drupal8/ce-dev/ce-dev.compose.prebuilt.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ services:
3131
# - Path */sites/*/files
3232
volumes:
3333
- ../:/home/ce-dev/deploy/live.local:delegated
34+
cap_add:
35+
- NET_ADMIN
3436
db:
3537
image: 'codeenigma/drupal8-db:latest'
3638
environment:

templates/drupal8/ce-dev/ce-dev.compose.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ services:
3131
# - Path */sites/*/files
3232
volumes:
3333
- ../:/home/ce-dev/deploy/live.local:delegated
34+
cap_add:
35+
- NET_ADMIN
3436
db:
3537
image: mariadb
3638
environment:

0 commit comments

Comments
 (0)