Merge pull request #95 from cisagov/lineage/skeleton

⚠️ CONFLICT! Lineage pull request for: skeleton

requirements.txt

@@ -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

src/base.yml

@@ -19,3 +19,15 @@
     - 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
+      vars:
+        # Symlink /etc/resolv.conf to a systemd-resolved-provided file
+        # that points to the DNS servers provided via DHCP instead of
+        # the DNS stub resolver.
+        systemd_resolved_resolv_conf_filename: >-
+          {{ dynamic_resolv_conf_target_dir }}/resolv.conf
+        # Disable the DNS stub listener, since users may want to use
+        # port 53 for their own DNS listener.
+        systemd_resolved_dns_stub_listener: false

src/requirements.yml

@@ -36,6 +36,8 @@ roles:
     src: https://github.com/cisagov/ansible-role-remove-python2
   - name: server_setup
     src: https://github.com/cisagov/ansible-role-server-setup
+  - name: systemd_resolved
+    src: https://github.com/cisagov/ansible-role-systemd-resolved
   - name: ufw
     src: https://github.com/cisagov/ansible-role-ufw
   - name: upgrade

src/version.txt

@@ -1 +1 @@
-__version__ = "0.4.0"
+__version__ = "0.4.1"