quick win

This commit is contained in:
Bertrand Lanson 2023-03-20 22:48:29 +01:00
parent 8375ae12f3
commit a68a207395
29 changed files with 546 additions and 81 deletions

8
.ansible-lint Normal file
View File

@ -0,0 +1,8 @@
---
warn_list:
- experimental # all rules tagged as experimental
- yaml # violations reported by yamllint
- meta-no-info
skip_list:
- jinja[spacing] # Rule that looks inside jinja2 templates.

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
# ignore molecule/testinfra pycache
**/__pycache__

82
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,82 @@
---
stages:
- verify
- test-default
- test-with-acl-enabled
image:
name: registry.ednz.fr/forge/ansible-runner
variables:
ANSIBLE_HOST_KEY_CHECKING: 'false'
ANSIBLE_FORCE_COLOR: 'true'
ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python3
DOCKER_AUTH_CONFIG: $CI_DOCKER_AUTH_CONFIG
.stage-test-default:
stage: test-default
.stage-test-with-acl-enabled:
stage: test-with-acl-enabled
.variables-ubuntu-2004:
variables:
MOLECULE_TEST_OS: "ubuntu2004"
.variables-ubuntu-2204:
variables:
MOLECULE_TEST_OS: "ubuntu2204"
.variables-debian-11:
variables:
MOLECULE_TEST_OS: "debian11"
.script-molecule-test-default:
script:
- molecule test
.script-molecule-test-with-acl-enabled:
script:
- molecule test -s with_acl_enabled
ansible-verify:
stage: verify
script:
- yamllint . -c .yamllint
- ansible-lint
ansible-test-ubuntu-2004-default:
extends:
- .stage-test-default
- .variables-ubuntu-2004
- .script-molecule-test-default
ansible-test-ubuntu-2204-default:
extends:
- .stage-test-default
- .variables-ubuntu-2204
- .script-molecule-test-default
ansible-test-debian-11-default:
extends:
- .stage-test-default
- .variables-debian-11
- .script-molecule-test-default
ansible-test-ubuntu-2004-with-acl-enabled:
extends:
- .stage-test-with-acl-enabled
- .variables-ubuntu-2004
- .script-molecule-test-with-acl-enabled
ansible-test-ubuntu-2204-with-acl-enabled:
extends:
- .stage-test-with-acl-enabled
- .variables-ubuntu-2204
- .script-molecule-test-with-acl-enabled
ansible-test-debian-11-with-acl-enabled:
extends:
- .stage-test-with-acl-enabled
- .variables-debian-11
- .script-molecule-test-with-acl-enabled

40
.yamllint Normal file
View File

@ -0,0 +1,40 @@
---
# Based on ansible-lint config
extends: default
rules:
braces:
max-spaces-inside: 1
level: error
brackets:
max-spaces-inside: 1
level: error
colons:
max-spaces-after: -1
level: error
commas:
max-spaces-after: -1
level: error
comments: enable
comments-indentation: disable
document-start: enable
empty-lines:
max: 3
level: error
hyphens:
level: error
indentation: enable
key-duplicates: enable
line-length:
max: 80
level: warning
new-line-at-end-of-file: enable
new-lines:
type: unix
trailing-spaces: enable
truthy:
allowed-values:
- 'true'
- 'false'
- 'yes'
- 'no'

20
LICENSE Normal file
View File

@ -0,0 +1,20 @@
The MIT License (MIT)
Copyright (c) 2017 Jeff Geerling
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

145
README.md
View File

@ -1,92 +1,75 @@
# dns_resolver_conf
DNS resolver conf
=========
> This repository is only a mirror. Development and testing is done on a private gitlab server.
This role configures dns resolvers on **debian-based** distributions.
Requirements
------------
## Getting started
None.
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
## Add your files
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
Role Variables
--------------
Available variables are listed below, along with default values. A sample file for the default values is available in `default/dns_resolver_conf.yml.sample` in case you need it for any `group_vars` or `host_vars` configuration.
```yaml
dns_resolv_conf_disable_resolvectl: false # by default, set to false
```
cd existing_repo
git remote add origin https://gitlab.ednz.fr/homelab/ansible-resources/roles/dns_resolver_conf.git
git branch -M main
git push -uf origin main
This variable determines if systemd-resolved should be kept enabled/started or not. On some systems, like dns servers, it can interfere with the actual server, and disabling it might be a good idea.
```yaml
dns_resolv_conf_path: '/etc'
```
This variable defines the path where the resolv.conf fie should be copied.
```yaml
dns_resolv_conf_nameservers: []
```
This variable is the list of nameservers to configure on the host.
```yaml
dns_resolv_conf_domain: ""
```
This variable sets the domain field in resolv.conf.
```yaml
dns_resolv_conf_search: []
```
This variable is a list of all the search domains. Ideally, only one of `dns_resolv_conf_domain` or `dns_resolv_conf_search` should be specified. The other should be left untouched.
```yaml
dns_resolv_conf_sortlist: []
```
This variable sets the sortlist option for resolv.conf. This option is a bit obsolete, and is here only for completeness of the config.
```yaml
dns_resolv_conf_options: []
```
This variable sets the options to pass in resolv.conf, like `rotate`, etc...
Dependencies
------------
None.
Example Playbook
----------------
Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
```yaml
# calling the role inside a playbook with either the default or group_vars/host_vars
- hosts: servers
roles:
- ednxzu.dns_resolver_conf
```
## Integrate with your tools
License
-------
- [ ] [Set up project integrations](https://gitlab.ednz.fr/homelab/ansible-resources/roles/dns_resolver_conf/-/settings/integrations)
MIT / BSD
## Collaborate with your team
Author Information
------------------
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
## Test and Deploy
Use the built-in continuous integration in GitLab.
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
***
# Editing this README
When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
## Suggestions for a good README
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
## Name
Choose a self-explaining name for your project.
## Description
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
## Badges
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
## Visuals
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
## Installation
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
## Usage
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
## Support
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
## Roadmap
If you have ideas for releases in the future, it is a good idea to list them in the README.
## Contributing
State if you are open to contributions and what your requirements are for accepting them.
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
## Authors and acknowledgment
Show your appreciation to those who have contributed to the project.
## License
For open source projects, say how it is licensed.
## Project status
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
This role was created by Bertrand Lanson in 2023.

View File

@ -0,0 +1,11 @@
---
# dns_resolv_conf_disable_resolvectl: false
# dns_resolv_conf_path: '/etc'
# dns_resolv_conf_nameservers:
# - "1.1.1.1"
# - "8.8.8.8"
# dns_resolv_conf_domain: ""
# dns_resolv_conf_search:
# - "local.lan"
# dns_resolv_conf_sortlist: []
# dns_resolv_conf_options: []

12
defaults/main.yml Normal file
View File

@ -0,0 +1,12 @@
---
# defaults file for dns_resolver_conf
dns_resolv_conf_disable_resolvectl: false
dns_resolv_conf_path: '/etc'
dns_resolv_conf_nameservers:
- "1.1.1.1"
- "8.8.8.8"
dns_resolv_conf_domain: ""
dns_resolv_conf_search:
- "local.lan"
dns_resolv_conf_sortlist: []
dns_resolv_conf_options: []

24
files/resolved.conf Executable file
View File

@ -0,0 +1,24 @@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See resolved.conf(5) for details
[Resolve]
#DNS=
#FallbackDNS=
#Domains=
#LLMNR=no
#MulticastDNS=no
#DNSSEC=no
#DNSOverTLS=no
#Cache=no-negative
#DNSStubListener=yes
#ReadEtcHosts=yes

2
handlers/main.yml Normal file
View File

@ -0,0 +1,2 @@
---
# handlers file for dns_resolver_conf

24
meta/main.yml Normal file
View File

@ -0,0 +1,24 @@
---
# meta file for dns_resolver_conf
galaxy_info:
namespace: 'ednxzu'
role_name: 'dns_resolver_conf'
author: 'Bertrand Lanson'
description: 'Configure dns resolution for debian-based distros.'
license: 'license (BSD, MIT)'
min_ansible_version: '2.10'
platforms:
- name: Ubuntu
versions:
- focal
- jammy
- name: Debian
versions:
- bullseye
galaxy_tags:
- 'ubuntu'
- 'debian'
- 'dns'
- 'resolvectl'
dependencies: []

View File

@ -0,0 +1,7 @@
---
- name: Converge
hosts: all
tasks:
- name: "Include ednxzu.dns_resolver_conf"
ansible.builtin.include_role:
name: "ednxzu.dns_resolver_conf"

View File

@ -0,0 +1,2 @@
---
dns_resolv_conf_path: '/tmp'

View File

@ -0,0 +1,41 @@
---
dependency:
name: galaxy
options:
requirements-file: ./requirements.yml
driver:
name: docker
platforms:
- name: instance
image: geerlingguy/docker-${MOLECULE_TEST_OS}-ansible
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup
cgroupns_mode: host
privileged: true
pre_build_image: true
provisioner:
name: ansible
config_options:
defaults:
remote_tmp: /tmp/.ansible
verifier:
name: testinfra
lint: |
yamllint -c .yamllint .
ansible-lint
scenario:
name: default
test_sequence:
- dependency
- lint
- cleanup
- destroy
- syntax
- create
- prepare
- converge
- idempotence
- verify
- cleanup
- destroy

View File

@ -0,0 +1,3 @@
---
# requirements file for molecule
roles: []

View File

@ -0,0 +1,22 @@
"""PyTest Fixtures."""
from __future__ import absolute_import
import os
import pytest
def pytest_runtest_setup(item):
"""Run tests only when under molecule with testinfra installed."""
try:
import testinfra
except ImportError:
pytest.skip("Test requires testinfra", allow_module_level=True)
if "MOLECULE_INVENTORY_FILE" in os.environ:
pytest.testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
os.environ["MOLECULE_INVENTORY_FILE"]
).get_hosts("all")
else:
pytest.skip(
"Test should run only from inside molecule.", allow_module_level=True
)

View File

@ -0,0 +1,20 @@
"""Role testing files using testinfra."""
def test_hosts_file(host):
"""Validate /etc/hosts file."""
etc_hosts = host.file("/etc/hosts")
assert etc_hosts.exists
assert etc_hosts.user == "root"
assert etc_hosts.group == "root"
def test_resolv_conf_file(host):
"""Validate resolv.conf file."""
tmp_resolv_conf = host.file("/tmp/resolv.conf")
assert tmp_resolv_conf.exists
assert tmp_resolv_conf.user == "root"
assert tmp_resolv_conf.group == "root"
assert tmp_resolv_conf.mode == 0o644
assert tmp_resolv_conf.contains("search local.lan")
assert tmp_resolv_conf.contains("nameserver 1.1.1.1")
assert tmp_resolv_conf.contains("nameserver 8.8.8.8")

View File

@ -0,0 +1,7 @@
---
- name: Converge
hosts: all
tasks:
- name: "Include ednxzu.dns_resolver_conf"
ansible.builtin.include_role:
name: "ednxzu.dns_resolver_conf"

View File

@ -0,0 +1,12 @@
---
dns_resolv_conf_disable_resolvectl: true
dns_resolv_conf_path: '/tmp'
dns_resolv_conf_nameservers:
- "10.1.20.53"
- "10.1.20.54"
dns_resolv_conf_domain: ""
dns_resolv_conf_search:
- "example.org"
- "az1.example.org"
dns_resolv_conf_sortlist: []
dns_resolv_conf_options: [edns0, rotate]

View File

@ -0,0 +1,41 @@
---
dependency:
name: galaxy
options:
requirements-file: ./requirements.yml
driver:
name: docker
platforms:
- name: instance
image: geerlingguy/docker-${MOLECULE_TEST_OS}-ansible
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup
cgroupns_mode: host
privileged: true
pre_build_image: true
provisioner:
name: ansible
config_options:
defaults:
remote_tmp: /tmp/.ansible
verifier:
name: testinfra
lint: |
yamllint -c .yamllint .
ansible-lint
scenario:
name: with_custom_config
test_sequence:
- dependency
- lint
- cleanup
- destroy
- syntax
- create
- prepare
- converge
- idempotence
- verify
- cleanup
- destroy

View File

@ -0,0 +1,3 @@
---
# requirements file for molecule
roles: []

View File

@ -0,0 +1,22 @@
"""PyTest Fixtures."""
from __future__ import absolute_import
import os
import pytest
def pytest_runtest_setup(item):
"""Run tests only when under molecule with testinfra installed."""
try:
import testinfra
except ImportError:
pytest.skip("Test requires testinfra", allow_module_level=True)
if "MOLECULE_INVENTORY_FILE" in os.environ:
pytest.testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
os.environ["MOLECULE_INVENTORY_FILE"]
).get_hosts("all")
else:
pytest.skip(
"Test should run only from inside molecule.", allow_module_level=True
)

View File

@ -0,0 +1,21 @@
"""Role testing files using testinfra."""
def test_hosts_file(host):
"""Validate /etc/hosts file."""
etc_hosts = host.file("/etc/hosts")
assert etc_hosts.exists
assert etc_hosts.user == "root"
assert etc_hosts.group == "root"
def test_resolv_conf_file(host):
"""Validate resolv.conf file."""
tmp_resolv_conf = host.file("/tmp/resolv.conf")
assert tmp_resolv_conf.exists
assert tmp_resolv_conf.user == "root"
assert tmp_resolv_conf.group == "root"
assert tmp_resolv_conf.mode == 0o644
assert tmp_resolv_conf.contains("search example.org az1.example.org")
assert tmp_resolv_conf.contains("nameserver 10.1.20.53")
assert tmp_resolv_conf.contains("nameserver 10.1.20.54")
assert tmp_resolv_conf.contains("options edns0 rotate")

10
tasks/main.yml Normal file
View File

@ -0,0 +1,10 @@
---
# task/main file for dns_resolver_conf
- name: "Import resolved_conf"
ansible.builtin.include_tasks: resolved_conf.yml
- name: "Import resolv_conf"
ansible.builtin.include_tasks: resolv_conf.yml
- name: "Import systemd"
ansible.builtin.include_tasks: systemd.yml

9
tasks/resolv_conf.yml Normal file
View File

@ -0,0 +1,9 @@
---
# task/resolv_conf for dns_resolver_conf
- name: "Copy /etc/resolv.conf file"
ansible.builtin.template:
src: "resolv.conf.j2"
dest: "{{ dns_resolv_conf_path }}/resolv.conf"
owner: root
group: root
mode: '0644'

9
tasks/resolved_conf.yml Normal file
View File

@ -0,0 +1,9 @@
---
# task/resolved_conf file for dns_resolver_conf
- name: "Copy dummy resolved.conf"
ansible.builtin.copy:
src: files/resolved.conf
dest: /etc/systemd/resolved.conf
owner: root
group: root
mode: '0644'

7
tasks/systemd.yml Normal file
View File

@ -0,0 +1,7 @@
---
# task/systemd file for dns_resolver_conf
- name: "Configure systemd-resolved"
ansible.builtin.systemd:
name: systemd-resolved
state: "{{ 'started' if not dns_resolv_conf_disable_resolvectl else 'stopped' }}"
enabled: "{{ 'true' if not dns_resolv_conf_disable_resolvectl else 'false' }}"

19
templates/resolv.conf.j2 Executable file
View File

@ -0,0 +1,19 @@
# {{ ansible_managed }}
{% if dns_resolv_conf_search is defined and dns_resolv_conf_search | length > 0 %}
search {{ dns_resolv_conf_search|join(' ') }}
{% endif %}
{% if dns_resolv_conf_domain is defined and dns_resolv_conf_domain != "" %}
domain {{ dns_resolv_conf_domain }}
{% endif %}
{% for ns in dns_resolv_conf_nameservers %}
nameserver {{ ns }}
{% endfor %}
{% if dns_resolv_conf_sortlist is defined and dns_resolv_conf_sortlist | length > 0 %}
{% for sl in dns_resolv_conf_sortlist %}
sortlist {{ sl }}
{% endfor %}
{% endif %}
{% if dns_resolv_conf_options is defined and dns_resolv_conf_options | length > 0 %}
options {{ dns_resolv_conf_options|join(' ') }}
{% endif %}

2
vars/main.yml Normal file
View File

@ -0,0 +1,2 @@
---
# vars file for dns_resolver_conf