diff --git a/docker-images/controller-ci/provision.yml b/docker-images/controller-ci/provision.yml index 114b15f..a385bf8 100644 --- a/docker-images/controller-ci/provision.yml +++ b/docker-images/controller-ci/provision.yml @@ -1,11 +1,11 @@ --- - hosts: localhost - become: yes + become: true vars: - _domain_name: ci.example.com - _ce_provision_build_tmp_dir: /tmp - _ce_provision_data_dir: /tmp - - is_local: yes + - is_local: true - _env_type: utility - ce_provision: own_repository: https://github.com/codeenigma/ce-provision.git diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml index 8fecf89..fbfde37 100644 --- a/docker-images/controller/provision.yml +++ b/docker-images/controller/provision.yml @@ -1,11 +1,11 @@ --- - hosts: localhost - become: yes + become: true vars: - _domain_name: example.com - _ce_provision_build_tmp_dir: /tmp - _ce_provision_data_dir: /tmp - - is_local: yes + - is_local: true - _env_type: utility - ce_deploy: own_repository: https://github.com/codeenigma/ce-deploy.git diff --git a/templates/blank/ce-dev/ansible/provision.yml.j2 b/templates/blank/ce-dev/ansible/provision.yml.j2 index 53bd73a..e6ddddb 100644 --- a/templates/blank/ce-dev/ansible/provision.yml.j2 +++ b/templates/blank/ce-dev/ansible/provision.yml.j2 @@ -1,7 +1,7 @@ --- - hosts: {{ project_name }}-{{ project_name }} - become: yes + become: true vars: - project_name: {{ project_name }} - _domain_name: www.{{ project_name }}.local @@ -10,7 +10,7 @@ enable_vnc: true tasks: - apt: - update_cache: yes + update_cache: true - import_role: name: _meta/common_base - import_role: diff --git a/templates/blank/ce-dev/ce-dev.compose.prebuilt.yml.j2 b/templates/blank/ce-dev/ce-dev.compose.prebuilt.yml.j2 index eacfef3..8b7f65c 100644 --- a/templates/blank/ce-dev/ce-dev.compose.prebuilt.yml.j2 +++ b/templates/blank/ce-dev/ce-dev.compose.prebuilt.yml.j2 @@ -11,6 +11,8 @@ x-ce_dev: services: {{ project_name }}: image: 'codeenigma/blank-blank:latest' + cap_add: + - NET_ADMIN x-ce_dev: unison: - src: ../ diff --git a/templates/blank/ce-dev/ce-dev.compose.yml.j2 b/templates/blank/ce-dev/ce-dev.compose.yml.j2 index 3dea316..5b7a321 100644 --- a/templates/blank/ce-dev/ce-dev.compose.yml.j2 +++ b/templates/blank/ce-dev/ce-dev.compose.yml.j2 @@ -11,6 +11,8 @@ x-ce_dev: services: {{ project_name }}: image: codeenigma/ce-dev-1.x:latest + cap_add: + - NET_ADMIN x-ce_dev: unison: - src: ../ @@ -20,4 +22,4 @@ services: - linux ignore: - Name vendor - - Name node_modules \ No newline at end of file + - Name node_modules diff --git a/templates/drupal8/ce-dev/ansible/deploy.yml.j2 b/templates/drupal8/ce-dev/ansible/deploy.yml.j2 index 18cf5de..77059d1 100644 --- a/templates/drupal8/ce-dev/ansible/deploy.yml.j2 +++ b/templates/drupal8/ce-dev/ansible/deploy.yml.j2 @@ -27,21 +27,21 @@ config_sync_directory: "config/sync" sanitize_command: "sql-sanitize" # Remove after initial pass, to avoid reinstalling Drupal. - force_install: yes + force_install: true base_url: "https://{{ _domain_name }}" # Composer command to run. - composer: command: install - no_dev: no + no_dev: false working_dir: "{{ deploy_path }}" - apcu_autoloader: no + apcu_autoloader: false pre_tasks: # You can safely remove these steps once you have a working composer.json. - name: Download composer file. get_url: url: https://raw.githubusercontent.com/drupal/recommended-project/8.8.x/composer.json dest: "{{ deploy_path }}/composer.json" - force: no + force: false - name: Install drush. command: cmd: composer require drush/drush diff --git a/templates/drupal8/ce-dev/ansible/provision.yml.j2 b/templates/drupal8/ce-dev/ansible/provision.yml.j2 index 3279545..be1bf99 100644 --- a/templates/drupal8/ce-dev/ansible/provision.yml.j2 +++ b/templates/drupal8/ce-dev/ansible/provision.yml.j2 @@ -1,5 +1,5 @@ - hosts: {{ project_name }}-web - become: yes + become: true vars: - _domain_name: www.{{ project_name }}.local - _env_type: dev @@ -22,15 +22,15 @@ cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem" key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem" handling: "unmanaged" - ratelimitingcrawlers: no - is_default: yes + ratelimitingcrawlers: false + is_default: true servers: - port: 80 - ssl: no - https_redirect: yes + ssl: false + https_redirect: true - port: 443 - ssl: yes - https_redirect: no + ssl: true + https_redirect: false upstreams: [] - php: version: @@ -47,7 +47,7 @@ {% endraw %} tasks: - apt: - update_cache: yes + update_cache: true - import_role: name: _meta/common_base - import_role: diff --git a/templates/drupal8/ce-dev/ce-dev.compose.prebuilt.yml.j2 b/templates/drupal8/ce-dev/ce-dev.compose.prebuilt.yml.j2 index ad86a4f..9902799 100644 --- a/templates/drupal8/ce-dev/ce-dev.compose.prebuilt.yml.j2 +++ b/templates/drupal8/ce-dev/ce-dev.compose.prebuilt.yml.j2 @@ -31,6 +31,8 @@ services: # - Path */sites/*/files volumes: - ../:/home/ce-dev/deploy/live.local:delegated + cap_add: + - NET_ADMIN db: image: 'codeenigma/drupal8-db:latest' environment: diff --git a/templates/drupal8/ce-dev/ce-dev.compose.yml.j2 b/templates/drupal8/ce-dev/ce-dev.compose.yml.j2 index c7a7256..61cd6f7 100644 --- a/templates/drupal8/ce-dev/ce-dev.compose.yml.j2 +++ b/templates/drupal8/ce-dev/ce-dev.compose.yml.j2 @@ -31,6 +31,8 @@ services: # - Path */sites/*/files volumes: - ../:/home/ce-dev/deploy/live.local:delegated + cap_add: + - NET_ADMIN db: image: mariadb environment: