Skip to content

Commit

Permalink
Merge pull request #108 from cisagov/lineage/skeleton
Browse files Browse the repository at this point in the history
⚠️ CONFLICT! Lineage pull request for: skeleton
  • Loading branch information
jsf9k authored May 17, 2024
2 parents 1755acd + 3180afb commit 944dd0b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
6 changes: 5 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ ansible>=8,<10
# ansible/ansible#82702, which breaks any symlinked files in vars,
# tasks, etc. for any Ansible role installed via ansible-galaxy.
#
# See also cisagov/skeleton-ansible-role#178.
# See also cisagov/skeleton-ansible-role#178 and
# cisagov/skeleton-generic#180. Note from these PRs that any changes
# made to this dependency must also be made in requirements-test.txt
# in cisagov/skeleton-ansible-role and .pre-commit-config.yaml in
# cisagov/skeleton-generic.
ansible-core<2.16.3
boto3
docopt
Expand Down
3 changes: 3 additions & 0 deletions src/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@
- name: Configure JournalD to preserve logs across reboots
ansible.builtin.include_role:
name: persist_journald
- name: Install and configure systemd-resolved
ansible.builtin.include_role:
name: systemd_resolved
2 changes: 2 additions & 0 deletions src/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ roles:
src: https://github.com/cisagov/ansible-role-python
- name: remove_python2
src: https://github.com/cisagov/ansible-role-remove-python2
- name: systemd_resolved
src: https://github.com/cisagov/ansible-role-systemd-resolved
- name: ufw
src: https://github.com/cisagov/ansible-role-ufw
- name: upgrade
Expand Down
2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.4.0"
__version__ = "0.4.1"

0 comments on commit 944dd0b

Please sign in to comment.