Skip to content

Commit

Permalink
Merge branch 'drybjed-small-bugfixes'
Browse files Browse the repository at this point in the history
  • Loading branch information
drybjed committed Oct 28, 2024
2 parents ef65dde + f0079d4 commit 069acfb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ General
Collections during new project creation if the :command:`ansible-galaxy`
command is not available in the user's ``$PATH``.

- The :ref:`tools/dist-upgrade.yml` playbook will not fail anymore during
- The :file:`tools/dist-upgrade.yml` playbook will not fail anymore during
:file:`/etc/services` database assembly if no upgrade was performed.

:ref:`debops.apache` role
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RUN apt-get -q update \
python3-wheel \
python3-pypandoc \
python3-sphinx \
python3-sphinx-rtd-theme \
pandoc \
make \
git
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/nginx/tasks/nginx_servers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@

- name: Generate nginx server configuration
ansible.builtin.template:
src: '{{ lookup("debops.debops.template_src", "etc/nginx/sites-available/" + ( item.type | d(nginx_default_type) ) + ".conf.j2") }}'
src: '{{ lookup("debops.debops.template_src", "etc/nginx/sites-available/" + (item.type | d(nginx_default_type)) + ".conf.j2") }}'
dest: '/etc/nginx/sites-available/{{ item.filename | d(item.name
if item.name is string
else item.name[0] | d("default")) }}.conf'
Expand Down
2 changes: 1 addition & 1 deletion docs/ansible/roles/python/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Available role tags:
Other resources
---------------

The :ref:`debops.resources` role can be used to manage pip and virtual
The :ref:`debops.resources` role can be used to manage pip and virtual
environments, see :ref:`resources__ref_pip` documentation for more details.

List of other useful resources related to the ``debops.python`` Ansible role:
Expand Down

0 comments on commit 069acfb

Please sign in to comment.