Skip to content

Commit

Permalink
Merge pull request #33 from remerge/fix-env-mode
Browse files Browse the repository at this point in the history
Fix nomad.env file mode to prevent double restart after upgrade
  • Loading branch information
hollow authored Apr 23, 2024
2 parents f97e764 + a38e069 commit 1e7f8f2
Show file tree
Hide file tree
Showing 7 changed files with 135 additions and 170 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Changes here will be overwritten by Copier
_commit: v2.9.0
_commit: v2.16.0
_src_path: gh:remerge/template
project_id: ansible-role-nomad
project_license: apache-2.0
Expand Down
3 changes: 0 additions & 3 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ dotenv_if_exists "${PWD}"/.env
# Add local scripts to PATH
PATH_add "${PWD}/bin"

# Enforce correct 1Password account
export OP_ACCOUNT=remerge.1password.com

# Disable macOS fork safety for Python compatibility
# https://docs.ansible.com/ansible/latest/reference_appendices/faq.html#running-on-macos
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ default_install_hook_types:
repos:
# https://github.com/pre-commit/pre-commit-hooks/tags
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v4.5.0"
rev: "v4.6.0"
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand Down Expand Up @@ -54,27 +54,27 @@ repos:

# https://github.com/pecigonzalo/pre-commit-shfmt/tags
- repo: https://github.com/pecigonzalo/pre-commit-shfmt
rev: "v2.1.0"
rev: "v2.2.0"
hooks:
- id: shell-fmt-go

# https://github.com/koalaman/shellcheck-precommit/tags
- repo: https://github.com/koalaman/shellcheck-precommit
rev: "v0.9.0"
rev: "v0.10.0"
hooks:
- id: shellcheck
name: shellcheck

# https://github.com/rhysd/actionlint/tags
- repo: https://github.com/rhysd/actionlint
rev: "v1.6.26"
rev: "v1.6.27"
hooks:
- id: actionlint-docker
name: actionlint

# https://github.com/ansible/ansible-lint/tags
- repo: https://github.com/ansible/ansible-lint
rev: "v24.2.0"
rev: "v24.2.2"
hooks:
- id: ansible-lint
name: ansible-lint
Expand All @@ -96,7 +96,7 @@ repos:

# https://github.com/bridgecrewio/checkov/tags
- repo: https://github.com/bridgecrewio/checkov
rev: "3.2.22"
rev: "3.2.74"
hooks:
- id: checkov
name: checkov
Expand Down
33 changes: 0 additions & 33 deletions compass.yaml

This file was deleted.

243 changes: 122 additions & 121 deletions poetry.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ authors = ["Remerge GmbH <[email protected]>"]
python = "^3.10, < 3.12"

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

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
dest: "{{ nomad_config_dir }}/nomad.env"
owner: nomad
group: nomad
mode: 0640
mode: 0644
notify:
- Restart nomad

Expand Down

0 comments on commit 1e7f8f2

Please sign in to comment.