Skip to content

Commit cb5d4e0

Browse files
gregharveymatej5Matej Stajduhartymofiisobchenkoklausi
authored
Bug fixes 2.x pr devel 2.x (#2149)
* Changing-aws-acl-when-statement (#2063) Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * R71127 r71052 check pr 2.x (#2073) * r71127-r71052-attemt-to-workaround-elb-module-change-or-bug * debug alb issue * revert changes as the bug is outside of ce-provision ansible-collections/amazon.aws#2376 * Newer aws collection test pr 2.x (#2077) * newer_aws_collection_test * 8.2.1 didnt work, back to 8.0.1 * r71171-efs-client-upgrade (#2079) * Turning-off-ami-cleanup-task (#2083) Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * Changing subnet for rds pr 2.x (#2087) * Changing-subnet-for-RDS * Uncommenting-tasks --------- Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * fix(debian/duplicity): Fix missing compilation dependencies (#2029) * fix(php-fpm): Set a good process children default for bigger servers (#1895) * fix(php-fpm): Set a good process children default for bigger servers * Fix min max logic * formatting * Fixing-RDS-backup-validation (#2089) Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * Updating-postfix-default-transport-maps (#2092) * Updating CI to 2.x. * Defending against missing Ansible. * Making the ce-provision-config branch in CI dynamic. * We do not want a 'ce-dev provision' because it breaks our controller. * Reverting 'ce-dev provision' change. * Trying a different ansible_facts var. * Testing using the source branch in ce-dev. * Setting max_childen to an integer to avoid CI issues. * Trying to change the python interpreter used. * Adding platform and cgroup values to ce-dev compose template. * Updated lambda backup validation reporting pr 2.x (#2099) * Updated-lambda-backup-validation-reporting * Updating-docs * Updating-lambda-handler * Adding-region-to-cloudwatch-task * Trimming-version-number-from-lambda * Fixing-text-manipulation * Updating-arn-for-cloudwatch-task --------- Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * Trying latest ubuntu containers in GitHub Actions. * Fixing the test.sh script to work with venvs. * Documentation for PHP in CI. * Bug fixes 2.x pr 2.x (#2096) * Improving AWS subnet docs. * Error in timers structure in the SSL role. * Removing obsolete backports requirements. * Allow the billing role to access Sustainability information. * Missing comma in IAM billing policy. * Removing broken GitLab Runner code. * Fixed the include_role task in gitlab_runner. * Suppressing a failure if there is no system pip to call. * Logic error in Ansible installer username, needs to be set from calling role. * ansible_user is a reserved variable, seems to be causing issues. * _ansible_ANYTHING is reserved, using _install_username instead. * python_boto role also needs the username set in the calling role. * Updating python_boto docs. * Making profile.d loading more robust. * Also pip removing ansible-core and trying with pip and pip3 to cover all bases. * Updating bad AWS SG role var namespacing in other roles. * Refactoring how we handle python3-pip. * Allow passing in of the Python interpreter to Ansible. * Updating the packages server for CE. * Installing Ansible in a venv on all machines. * Changing common_base format for readability. * No need to specify Python to the point release. * Docs update. * Fixing LDAP SSL to use systemd timer. * Allowing different systemd timer names for different Ansible installs. * Fixing dynamic key name in ansible role. * Trying to debug missing timer_command var. * Treating the timer string so it becomes a dict. * Moving default log location for clamav. * Updating ClamAV docs. * Grouping systemd timer tasks together. * Exposing ce-provision version in build output. * Wrong variable in meta role for controller username. * Removing any reference to _aws variables in debian role defaults. * Setting more sane ASG defaults. * Making ClamAV timers a list so they can be entirely replaced. * Spacing fix for linting. * Renaming npm module. * Removing NGINX installation as part of phpMyAdmin role by default. * Fixing Varnish handler names. * Excluding name[casing] rule from linting due to false positives. * Put rule in wrong place! * Removing lock file behaviour from ASGs as it cannot work unless controller and ASG are in the same VPC. * Capturing lock file limitations in comment. * Updating documentation for LE. * Using pip to install certbot plugins. * Updating README docs. * Docs error corrected. * Working around deprecated SSH algorithms. * Upgrading SSH key type standard for controller and deploy users. * Adding SCP args for legacy mode needed by Packer. * Adding an extra when clause to ACM SAN cert check. * Trying different approach to ACM SAN cert check. * Removing /bin/which from rkhunter defaults, it isn't present in Debian 11. * RDS param group module has changed name. * Adding passlib to libraries installed for ce-provision. * Adding in valid path for 'which' to rkhunter. * Catching up documentation. * Catching up documentation. * Making user creation optional and home directories a variable. * Missed passing new home var to task. * Fixing firewall.bash deletion issues. * Getting rid of accidental extra braces. * Simplifying usernames so you only need to set one var. * Docs update and making Ansible installation via _init an option. * Variable path error. * Updating linter ignore paths. * Making the NGINX test result var private. * Documentation update. * Fixing role dependency in NGINX role. * Adding installation path handling for Galaxy collections. * Removing -p option due to unexpected ill effects for role paths. * Moving X-Content-Type-Options header to project type templates. * Adding some inline documentation. * Fixing Postfix template to allow external relays. * Adding a FQDN postfix transport map. * Updating CI to 2.x. * Defending against missing Ansible. * Making the ce-provision-config branch in CI dynamic. * We do not want a 'ce-dev provision' because it breaks our controller. * Reverting 'ce-dev provision' change. * Trying a different ansible_facts var. * Testing using the source branch in ce-dev. * Setting max_childen to an integer to avoid CI issues. * Trying to change the python interpreter used. * Adding platform and cgroup values to ce-dev compose template. * Trying latest ubuntu containers in GitHub Actions. * Fixing the test.sh script to work with venvs. * Documentation for PHP in CI. * Adding GitLab test back in. * Fixing role namespaces. * Avoiding-backup-restoration-for-dev-env (#2108) Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * Updating-nodejs-to-nodistro (#2094) * Updating-nodejs-to-nodistro * Fixing-nodejs-unattended-upgrades * r71344-Updating-aws-acl-role (#2111) Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * r71344-Updating-aws-acl-role (#2112) * r71344-Updating-aws-acl-role * Adding-option-to-avoid-recreating-ACLs * Updating-aws-acl-vars * Updating-aws-acl-vars-2 --------- Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * Fixing-non-utf8-item (#2116) Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * Fixing non utf8 item pr 2.x (#2117) * Fixing-non-utf8-item * Changing-var-name-for-when-condition --------- Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * Minor bug fixes to ce-provision installer. * Testing installing ce-provision in the GitHub Actions container directly. * Using the submitted install script as well. * Trying as runner user. * Trying to use the ce-dev base container. * Fixing-utf8 (#2129) * Fixing utf8-2.x (#2131) * Fixing-utf8 * Adding-debug * Changing-lambda-creation-from-tip-file-to-s3 (#2122) * Changing-lambda-creation-from-tip-file-to-s3 * Fixing-syntax-error * indentation-fix * Finishing-backup-valdation-role --------- Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * Updating email notification title pr 2.x (#2140) * Updating-email-notification-title * Resolving-conflicts * Resolving-conflicts-2 --------- Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> * Adding-defaults-to-max-children (#2141) * Adding defaults to max children pr 2.x (#2144) * Adding-defaults-to-max-children * Updating-max-children * Updating-php-defaults (#2145) * Updating php defaults pr 2.x (#2147) * Updating-php-defaults * Updating-php-defaults * Updating-php-defaults * Updating key name. * Suppressing systemd actions in Docker. * Seems Ansible flags have changed. * Still trying to get --extra-vars right! * Catching Ansible Galaxy upgrade timers for docker containers. * Trying to force --roles-path for Galaxy. * Trying different quotes. * Missed a line. * Trying a different approach to passing vars. * Adding some debug. * Running ce-python debug first. * Trying moving to the ce-provision directory. * Checking the specific path to galaxy roles in ce-provision. * Trying as controller user again. * Trying to make the roles dir. * Being consistent about paths in bash. * Removing debug lines for now. * Allowing script to skip iptables. * Misnamed flag. * Adding user_provision role to configure controller user. * Wrapping cleanup so it doesn't break GitHub Actions. * Completing variables for user_provisin. * Missed the sudoers var. * Quoting vars. * GitLab installer needs _domain_name. * Logic error in clean-up script. * Fixing paths to ce-provision in container. * Trying to fix CI perms issues. * Git dubious ownership error. * Git dubious ownership error. * Running the web server test as the controller user. * Missed a controller var. * Commenting out the CE container to test. * Adding a separate step for Git actions. * Need sudo for Ubuntu. * efs_version_fix_for_old_debian_workaround (#2151) * Using a volume to persist data between steps. * Adding debug commands to test volumes. * Tweaking volumes. * Adding the checkout command back in. * Trying a different approach. * ls command looks good, so putting web build back in. * More Ansible Galaxy debug. * Trying to make ansible-galaxy detect installed roles. * Run galaxy command as controller. * Trying galaxy command and cd wrapped in su. * Specifically checking the contents of galaxy/roles. * Trying a double-tap install process. * Quick refactor and debug of SSH. * Adding OpenSSH server package. * Checking for a firewall. * Checking listening packages. * Starting SSHD especially. * Starting SSHD without systemd. * Pre-empting config a bit more. * More galaxy path debug. * fix(duplicity): Fix file name of include/exclude list (#2152) * Running a find to see if we can find the missing roles. * More verbosity. * Checking for missing requirements file. * Removing eroneous when clause. * Tidying up redundant debug lines. * Creating a separate ci.yml play targeting localhost. * Making sure sshd is running. * Tidying up GitLab CI file and installing SSHD. * Installing SSHD as a separate step. * SSHD already installed, starting it instead. * Don't create systemd timers in containers. * Preparing a test GitLab build. * Making builds nightly and fixing GitLab role bug. * Ensuring is_local var exists and making lock behaviour optional. * Fixing location and owner of Blackfire config so it is configurable. * Documentation update. * Removing all is defined checks for is_local since it is now always defined. * Letting GitLab know it's on Docker earlier. * Trying to run runsvdir-start to avoid container freezing. * Temporarily skipping reconfigure of GitLab to test the rest. * Trying to move GitLab reconfigure commands to CI. * Fixing service namespace for runner and reinstating GitLab tasks. * Trying to get config script working for GitLab in CI. * No systemd, do not try to restart gitlab-runner. * Removing firewall role from CI GitLab test, don't need it and it breaks CI. * Outputting PostGreSQL logs to see if there are errors. * Outputting PostGreSQL logs to see if there are errors. * Trying the config script for GitLab again. * Suppressing extra GitLab config for CI runs. * Setting Blackfire CLI defaults to use ce-dev user. --------- Co-authored-by: Matej Štajduhar <30931414+matej5@users.noreply.github.com> Co-authored-by: Matej Stajduhar <matej.stajduhar@codeenigma.com> Co-authored-by: tymofiisobchenko <104431720+tymofiisobchenko@users.noreply.github.com> Co-authored-by: Klaus Purer <klaus.purer@protonmail.ch> Co-authored-by: drazenCE <140631110+drazenCE@users.noreply.github.com>
1 parent ef705ce commit cb5d4e0

File tree

40 files changed

+232
-137
lines changed

40 files changed

+232
-137
lines changed

Diff for: ‎.github/workflows/ce-provision-test-gitlab.yml

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
name: Run GitLab server test build
22

3-
# Run this workflow every time a new commit pushed to your repository
4-
on: pull_request
3+
# Run this workflow nightly and every time a new commit pushed to your repository
4+
on:
5+
schedule:
6+
- cron: '30 4 * * *'
7+
pull_request:
58

69
jobs:
710
# Set the job key. The key is displayed as the job name
811
# when a job name is not provided
912
test-gitlab:
13+
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
1014
# Name the Job
11-
name: Run tests against Ansible code base
15+
name: Build a GitLab server with ce-provision
1216
# Set the type of machine to run on
1317
runs-on: ubuntu-latest
1418

15-
steps:
16-
# Checks out a copy of your repository on the ubuntu-latest machine
17-
- name: Checkout code
18-
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
19-
uses: actions/checkout@v2
19+
# Use our ce-dev Debian base container
20+
container:
21+
image: codeenigma/ce-dev:2.x
22+
volumes:
23+
- ${{ github.workspace }}:/home/controller
2024

21-
# Installs the ce-dev stack
22-
- name: Install ce-dev
23-
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
25+
steps:
26+
- name: Install ce-provision
2427
run: |
25-
cd /tmp
26-
wget https://golang.org/dl/go1.15.8.linux-amd64.tar.gz
27-
sudo tar -C /usr/local -xzf go1.15.8.linux-amd64.tar.gz
28-
export PATH=$PATH:/usr/local/go/bin
29-
git clone https://github.com/FiloSottile/mkcert && cd mkcert
30-
go build -ldflags "-X main.Version=$(git describe --tags)"
31-
sudo mv ./mkcert /usr/local/bin && cd ../
32-
sudo chmod +x /usr/local/bin/mkcert
33-
rm -Rf mkcert
34-
curl -sL https://raw.githubusercontent.com/codeenigma/ce-dev/${{ github.event.pull_request.base.ref }}/install.sh | /bin/sh -s -- --platform linux
28+
/usr/bin/curl -LO https://raw.githubusercontent.com/codeenigma/ce-provision/${{ github.event.pull_request.head.ref }}/install.sh
29+
/usr/bin/chmod +x ./install.sh
30+
/usr/bin/sudo ./install.sh --version ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }} --docker --no-firewall
3531
36-
# Uses the ce-dev stack to run a test provision
37-
- name: Run a test provision
38-
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
32+
# Run a GitLab server provision
33+
- name: Prepare Git repos on disk
3934
run: |
40-
git clone --branch ${{ github.event.pull_request.base.ref }} https://github.com/codeenigma/ce-dev-ce-provision-config.git config
41-
/bin/bash ce-dev/ansible/test.sh --examples gitlab --own-branch ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }}
42-
shell: bash
35+
/usr/bin/git config --global --add safe.directory /home/controller/ce-provision
36+
/usr/bin/git config --global --add safe.directory /home/controller/ce-provision/config
37+
38+
- name: Start SSHD
39+
run: /usr/sbin/sshd&
40+
41+
- name: Provision a test GitLab server
42+
run: /usr/bin/su - controller -c "cd /home/controller/ce-provision && /bin/sh /home/controller/ce-provision/scripts/provision.sh --python-interpreter /home/controller/ce-python/bin/python3 --repo dummy --branch dummy --workspace /home/controller/ce-provision/ce-dev/ansible --playbook plays/gitlab/ci.yml --own-branch ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }} --force"

Diff for: ‎.github/workflows/ce-provision-test-web.yml

+19-37
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,42 @@
11
name: Run web server test build
22

3-
# Run this workflow every time a new commit pushed to your repository
4-
on: pull_request
3+
# Run this workflow nightly and every time a new commit pushed to your repository
4+
on:
5+
schedule:
6+
- cron: '30 4 * * *'
7+
pull_request:
58

69
jobs:
710
# Set the job key. The key is displayed as the job name
811
# when a job name is not provided
912
test-web:
13+
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
1014
# Name the Job
11-
name: Run tests against Ansible code base
15+
name: Build a web server with ce-provision
1216
# Set the type of machine to run on
1317
runs-on: ubuntu-latest
1418

1519
# Use our ce-dev Debian base container
1620
container:
1721
image: codeenigma/ce-dev:2.x
22+
volumes:
23+
- ${{ github.workspace }}:/home/controller
1824

1925
steps:
20-
# Checks out a copy of your repository on the ubuntu-latest machine
21-
#- name: Checkout code
22-
# if: ${{ github.event.pull_request.head.ref != 'documentation' }}
23-
# uses: actions/checkout@v2
24-
25-
# Installs ce-provision
2626
- name: Install ce-provision
27-
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
2827
run: |
29-
curl -LO https://raw.githubusercontent.com/codeenigma/ce-provision/${{ github.event.pull_request.head.ref }}/install.sh
30-
chmod +x ./install.sh
31-
sudo ./install.sh --version ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }} --docker
28+
/usr/bin/curl -LO https://raw.githubusercontent.com/codeenigma/ce-provision/${{ github.event.pull_request.head.ref }}/install.sh
29+
/usr/bin/chmod +x ./install.sh
30+
/usr/bin/sudo ./install.sh --version ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }} --docker --no-firewall
3231
3332
# Run a web server provision
34-
- name: Provision a test web server
35-
if: ${{ github.event.pull_request.head.ref != 'documentation' }}
33+
- name: Prepare Git repos on disk
3634
run: |
37-
/bin/sh /home/runner/ce-provision/scripts/provision.sh --python-interpreter /home/runner/ce-python/bin/python3 --repo dummy --branch dummy --workspace /home/runner/ce-provision/ce-dev/ansible --playbook plays/web/web.yml --own-branch ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }} --force
35+
/usr/bin/git config --global --add safe.directory /home/controller/ce-provision
36+
/usr/bin/git config --global --add safe.directory /home/controller/ce-provision/config
3837
39-
# Installs the ce-dev stack
40-
#- name: Install ce-dev
41-
# if: ${{ github.event.pull_request.head.ref != 'documentation' }}
42-
# run: |
43-
# cd /tmp
44-
# wget https://golang.org/dl/go1.15.8.linux-amd64.tar.gz
45-
# sudo tar -C /usr/local -xzf go1.15.8.linux-amd64.tar.gz
46-
# export PATH=$PATH:/usr/local/go/bin
47-
# git clone https://github.com/FiloSottile/mkcert && cd mkcert
48-
# go build -ldflags "-X main.Version=$(git describe --tags)"
49-
# sudo mv ./mkcert /usr/local/bin && cd ../
50-
# sudo chmod +x /usr/local/bin/mkcert
51-
# rm -Rf mkcert
52-
# curl -sL https://raw.githubusercontent.com/codeenigma/ce-dev/${{ github.event.pull_request.base.ref }}/install.sh | /bin/sh -s -- --platform linux
38+
- name: Start SSHD
39+
run: /usr/sbin/sshd&
5340

54-
# Uses the ce-dev stack to run a test provision
55-
#- name: Run a test provision
56-
# if: ${{ github.event.pull_request.head.ref != 'documentation' }}
57-
# run: |
58-
# git clone --branch ${{ github.event.pull_request.base.ref }} https://github.com/codeenigma/ce-dev-ce-provision-config.git config
59-
# /bin/bash ce-dev/ansible/test.sh --examples web --own-branch ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }}
60-
# shell: bash
41+
- name: Provision a test web server
42+
run: /usr/bin/su - controller -c "cd /home/controller/ce-provision && /bin/sh /home/controller/ce-provision/scripts/provision.sh --python-interpreter /home/controller/ce-python/bin/python3 --repo dummy --branch dummy --workspace /home/controller/ce-provision/ce-dev/ansible --playbook plays/web/ci.yml --own-branch ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }} --force"

Diff for: ‎ce-dev/ansible/plays/gitlab/ci.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
- hosts: localhost
3+
become: true
4+
5+
vars:
6+
project_name: gitlab
7+
is_local: true
8+
_ce_provision_base_dir: /home/ce-dev/ce-provision
9+
_init:
10+
force_play: true
11+
vars_dirs:
12+
- "{{ _ce_provision_base_dir }}/ce-dev/ansible/vars/_common"
13+
- "{{ _ce_provision_base_dir }}/ce-dev/ansible/vars/{{ project_name }}"
14+
15+
tasks:
16+
- ansible.builtin.import_role:
17+
name: _init
18+
- ansible.builtin.import_role:
19+
name: debian/user_provision
20+
- ansible.builtin.import_role:
21+
name: _meta/common_base
22+
- ansible.builtin.import_role:
23+
name: debian/ce_deploy
24+
- ansible.builtin.import_role:
25+
name: aws/aws_credentials
26+
- ansible.builtin.import_role:
27+
name: debian/gitlab
28+
- ansible.builtin.import_role:
29+
name: debian/gitlab_runner
30+
- ansible.builtin.import_role:
31+
name: debian/ssh_server
32+
- ansible.builtin.import_role:
33+
name: debian/sops
34+
- ansible.builtin.import_role:
35+
name: debian/gpg_key
36+
- ansible.builtin.import_role:
37+
name: _exit

Diff for: ‎ce-dev/ansible/plays/web/ci.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
# Spin up a "web" instance.
3+
- hosts: localhost
4+
become: true
5+
6+
vars:
7+
project_name: web
8+
is_local: true
9+
_ce_provision_base_dir: /home/ce-dev/ce-provision
10+
_init:
11+
force_play: true
12+
vars_dirs:
13+
- "{{ _ce_provision_base_dir }}/ce-dev/ansible/vars/_common"
14+
- "{{ _ce_provision_base_dir }}/ce-dev/ansible/vars/{{ project_name }}"
15+
16+
tasks:
17+
- ansible.builtin.import_role:
18+
name: _init
19+
- ansible.builtin.import_role:
20+
name: _meta/webserver
21+
- ansible.builtin.import_role:
22+
name: _exit

Diff for: ‎ce-dev/ansible/vars/gitlab/gitlab_runner.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
gitlab_runner:
2+
restart: false # no systemd in CI containers

Diff for: ‎docs/roles/_init.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ This is meant to ALWAYS be included as the first task of a play. If you include
99
## Default variables
1010
```yaml
1111
---
12-
_ce_provision_username: "{% if is_local is defined and is_local %}ce-dev{% else %}controller{% endif %}"
12+
# Set this variable to true to tell ce-provision it is running in a container.
13+
is_local: false
14+
15+
_ce_provision_username: "{% if is_local %}ce-dev{% else %}controller{% endif %}"
1316
_venv_path: "/home/{{ _ce_provision_username }}/ce-python"
1417
_venv_command: /usr/bin/python3 -m venv
1518
_venv_install_username: "{{ _ce_provision_username }}"
@@ -25,8 +28,8 @@ _init:
2528
# This is used to detect if the playbook must re-run or not.
2629
vars_dirs: []
2730
force_play: false
28-
lock_file: /tmp/ce-provision-lock
29-
deploy_lock_file: /tmp/ce-deploy-lock # must match lock_file in ce-deploy
31+
lock_file: /tmp/ce-provision-lock # set to an empty string to disable locking behaviour
32+
deploy_lock_file: /tmp/ce-deploy-lock # must match lock_file in ce-deploy, set to an empty string to disable locking behaviour
3033
ce_provision_version: 2.x # Outputted by the _init role at the start of plays
3134
install_ansible: true # set to false to not install Ansible in a venv
3235

Diff for: ‎docs/roles/debian/aws_efs_client.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ _mount_state: present
4646
aws_efs_client:
4747
aws_profile: example # AWS boto profile name - can be substituted for "{{ _aws_profile }}" if set
4848
region: eu-west-1 # AWS region name - can be substituted for "{{ _aws_region }}" if set
49-
version: 2.1.0 # version of AWS EFS utils to use
49+
version: "{{ '1.35.0' if ansible_distribution_major_version | int < 12 else '2.1.0' }}" # 2.1.0 requires libssl v3 which is absent on Debian < 12 by default.
5050
build_suffix: "-1_all" # sometimes there is a suffix appended to the package name, e.g. `amazon-efs-utils-1.35.0-1_all.deb`
5151
deb_url: "" # provide an alternative location for the .deb package
5252
# See https://docs.ansible.com/ansible/latest/modules/mount_module.html

Diff for: ‎docs/roles/debian/ce_deploy.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Installs Code Enigma's deploy stack on a server.
88
```yaml
99
---
1010
_ce_deploy:
11-
username: "{% if is_local is defined and is_local %}ce-dev{% else %}deploy{% endif %}"
11+
username: "{% if is_local %}ce-dev{% else %}deploy{% endif %}"
1212

1313
ce_deploy:
1414
# These are usually set in the _init role using _venv_path, _venv_command and _venv_install_username but can be overridden.

Diff for: ‎docs/roles/debian/gitlab.md

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ gitlab:
3838
ssl: # @see the 'ssl' role. Note that domain is autopopulated from server_name above.
3939
enabled: false # manual SSL handling disabled by default
4040
handling: selfsigned
41+
replace_existing: false
4142
# Linux setup
4243
linux_user: git
4344
linux_group: git

Diff for: ‎docs/roles/debian/php-fpm.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ php:
2323
# It is important to scale up processes on bigger servers, so that more
2424
# requests can be handled. Double the number of vCPUs is a good default.
2525
# Can be between 5 and 64.
26-
max_children: "{{ [5, [ansible_facts.ansible_processor_nproc * 2, 64] | min] | max }}"
26+
max_children: "{{ [5, [(ansible_facts.ansible_processor_nproc | default(1)) * 2, 64] | min] | max }}" # Fallback in case ansible_processor_nproc is not gathered before tasks
2727
start_servers: 2
2828
min_spare_servers: 1
2929
max_spare_servers: 3

0 commit comments

Comments
 (0)