Skip to content

Commit 1e7f8f2

Browse files
authored
Merge pull request #33 from remerge/fix-env-mode
Fix nomad.env file mode to prevent double restart after upgrade
2 parents f97e764 + a38e069 commit 1e7f8f2

File tree

7 files changed

+135
-170
lines changed

7 files changed

+135
-170
lines changed

.copier-answers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# Changes here will be overwritten by Copier
3-
_commit: v2.9.0
3+
_commit: v2.16.0
44
_src_path: gh:remerge/template
55
project_id: ansible-role-nomad
66
project_license: apache-2.0

.envrc

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ dotenv_if_exists "${PWD}"/.env
1616
# Add local scripts to PATH
1717
PATH_add "${PWD}/bin"
1818

19-
# Enforce correct 1Password account
20-
export OP_ACCOUNT=remerge.1password.com
21-
2219
# Disable macOS fork safety for Python compatibility
2320
# https://docs.ansible.com/ansible/latest/reference_appendices/faq.html#running-on-macos
2421
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES

.pre-commit-config.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ default_install_hook_types:
1010
repos:
1111
# https://github.com/pre-commit/pre-commit-hooks/tags
1212
- repo: https://github.com/pre-commit/pre-commit-hooks
13-
rev: "v4.5.0"
13+
rev: "v4.6.0"
1414
hooks:
1515
- id: check-added-large-files
1616
- id: check-case-conflict
@@ -54,27 +54,27 @@ repos:
5454

5555
# https://github.com/pecigonzalo/pre-commit-shfmt/tags
5656
- repo: https://github.com/pecigonzalo/pre-commit-shfmt
57-
rev: "v2.1.0"
57+
rev: "v2.2.0"
5858
hooks:
5959
- id: shell-fmt-go
6060

6161
# https://github.com/koalaman/shellcheck-precommit/tags
6262
- repo: https://github.com/koalaman/shellcheck-precommit
63-
rev: "v0.9.0"
63+
rev: "v0.10.0"
6464
hooks:
6565
- id: shellcheck
6666
name: shellcheck
6767

6868
# https://github.com/rhysd/actionlint/tags
6969
- repo: https://github.com/rhysd/actionlint
70-
rev: "v1.6.26"
70+
rev: "v1.6.27"
7171
hooks:
7272
- id: actionlint-docker
7373
name: actionlint
7474

7575
# https://github.com/ansible/ansible-lint/tags
7676
- repo: https://github.com/ansible/ansible-lint
77-
rev: "v24.2.0"
77+
rev: "v24.2.2"
7878
hooks:
7979
- id: ansible-lint
8080
name: ansible-lint
@@ -96,7 +96,7 @@ repos:
9696

9797
# https://github.com/bridgecrewio/checkov/tags
9898
- repo: https://github.com/bridgecrewio/checkov
99-
rev: "3.2.22"
99+
rev: "3.2.74"
100100
hooks:
101101
- id: checkov
102102
name: checkov

compass.yaml

-33
This file was deleted.

poetry.lock

+122-121
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ authors = ["Remerge GmbH <[email protected]>"]
88
python = "^3.10, < 3.12"
99

1010
[tool.poetry.group.dev.dependencies]
11-
black = "^24.2.0"
11+
black = "^24.4.0"
1212
flake8 = "^7.0.0"
1313
flake8-bugbear = "^24.2.6"
14-
pylint = "^3.0.3"
15-
tox = "^4.13.0"
16-
molecule = { extras = ["docker"], version = "^24.2.0" }
17-
ansible-lint = { version = "^24.2.0", markers = "platform_system != 'Windows'" }
14+
pylint = "^3.1.0"
15+
tox = "^4.14.2"
16+
molecule = { extras = ["docker"], version = "^24.2.1" }
17+
ansible-lint = { version = "^24.2.2", markers = "platform_system != 'Windows'" }
1818

1919
[build-system]
2020
requires = ["poetry-core>=1.0.0"]

tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
dest: "{{ nomad_config_dir }}/nomad.env"
6565
owner: nomad
6666
group: nomad
67-
mode: 0640
67+
mode: 0644
6868
notify:
6969
- Restart nomad
7070

0 commit comments

Comments
 (0)