Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/apache status, rework and improvments #8

Merged
merged 21 commits into from
Feb 11, 2017
Merged

Feature/apache status, rework and improvments #8

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
76dcb7a
Add the `apache__mpm_max_connections_per_child` variable
ypid Jan 4, 2017
98e39f0
Move OCSP Stapling default vars below basic TLS configuration
ypid Jan 4, 2017
6d97fe5
Ensure that the shared object cache provider is loaded when required
ypid Jan 4, 2017
014abc8
Change default virtual host to `default.{{ + apache__domain }}`
ypid Jan 9, 2017
83d3086
Add support to enable and configure Apache mod_status
ypid Jan 9, 2017
dccad54
Support generic Apache template generation using the IfVersion directive
ypid Jan 9, 2017
c6d7cb8
Regen README
ypid Jan 9, 2017
7cc530d
Fix indention of directives applied to the root dir of vhosts
ypid Jan 9, 2017
3f7d6ab
Fix spelling in docs
ypid Jan 9, 2017
15a1227
Change `apache__hsts_preload` from `True` to `False` by default
ypid Jan 9, 2017
505e6f2
Fix spelling of apache__snippets type introduced in this branch
ypid Jan 9, 2017
bbd9061
Use singular apache__ref_vhost_ label as docs anchor
ypid Jan 9, 2017
2a0c2b6
Fix role run with `apache__deploy_state: absent` after `present` was set
ypid Jan 13, 2017
e7e00ba
Add Ansible tags for env roles
ypid Jan 17, 2017
5e76849
Add missing filename suffixes in docs
ypid Feb 1, 2017
9354f6d
Fix spelling
ypid Feb 7, 2017
185e1bf
Fix missing newline in configuration which produced invalid syntax
ypid Feb 7, 2017
b1231f7
Improve spelling and indention
ypid Feb 7, 2017
5f0bebb
Ensure that the rewrite module is loaded when required by the role
ypid Feb 7, 2017
04d02e3
Incorporate review by @drybjed, thanks!
ypid Feb 7, 2017
22d4718
Prepare debops__tpl_macros.j2 upstreaming
ypid Feb 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 45 additions & 2 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,47 @@ The current role maintainer_ is ypid_.


debops.apache v0.1.0 - unreleased
----------------------------------------
---------------------------------

Added
~~~~~

- Initial coding and design. [ypid_]

- Add/Set the default `Referrer Policy`_ to ``no-referrer`` and made it
configurable via :ref:`item.http_referrer_policy <apache__ref_vhosts_http_referrer_policy>`.
configurable via :ref:`item.http_referrer_policy <apache__ref_vhost_http_referrer_policy>`.
[ypid_]

- Add the :envvar:`apache__mpm_max_connections_per_child` variable to allow to
configure the number of requests a child process should handle before
terminating. [ypid_]

- Add support to enable and configure `Apache mod_status`_. You can set
:envvar:`apache__status_enabled` to ``True`` to enable it and make the status
page accessible from localhost. [ypid_]

- Add support for generic Apache template generation using the `Apache IfVersion directive`_.
This feature can be configured by :envvar:`apache__config_use_if_version` and
:envvar:`apache__config_min_version`. [ypid_]

- Add Ansible tags for env roles. To only prepare the Apache role
environment, you can use the ``role::apache:env`` tag. [ypid_]

Changed
~~~~~~~

- Change default virtual host server name from ``000-default`` to ``default.{{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How much does debops care about users who upgrade this role? E.g. should it be mentioned what the user has to do to get rid of old, unmaintained files? In this case, it seems that 000-default needs to be deleted manually.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah. no. sorry, I was confused.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before you delete any files, check if they are configuration files included in a package:

dpkg-query -s apache2
dpkg -S /etc/apache2/sites-available/000-default

If so, you shouldn't remove them. This might hinder future upgrades, automated or not. Instead, you should divert the affected files either in the same directory with a different suffix (usually .dpkg-divert) or to another directory altogether so that the package manager still knows that they exist and can perform the package upgrades correctly.

This is different with the configuration files generated on the package installation dynamically, or managed by the ucf system. In this case, you should check the postinstall script of a given package for some clues how to handle this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not change the filename and thus does not leave unmaintained files danging around. But to your question, sure, something like this would be noted if it can not be avoided (which would be preferred obviously). But this does not necessarily apply to a unreleased role but thanks for checking back 😉

Ref: debops/docs#160

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@drybjed The role already takes care of this 😉

apache__domain }}`` to increase the chances that a valid certificate is
available for this virtual host (either wildcard or SAN) in order to avoid
the warning of Apache that the certificate is not valid for the server name. [ypid_]

- Change :envvar:`apache__hsts_preload` from ``True`` to ``False`` by default.
Setting this value to ``True`` alone does not achieve anything and can
actually cause problems if you are not prepared.
Thus it is disabled by default.
If you are ready for the future of HTTPS and TLS only, you are encouraged to
enable it! [ypid_]

Fixed
~~~~~

Expand All @@ -31,3 +61,16 @@ Fixed
Note that all dependency variables should be passed to the main
``debops.apache`` role to avoid confusion. :envvar:`apache__dependent_packages` now
only works when passed to the main role.

- Ensure that the shared object cache provider module is loaded when required
for :envvar:`apache__ocsp_stapling_cache`. Before, the ``socache_shmcb``
module was implicitly loaded by the ``ssl`` module. [ypid_]

- Ensure that the rewrite module is loaded when it is used by the configuration
generated by the role. [ypid_]

- Fix ``item.https_enabled`` support for virtual hosts. This variable was
ignored previously using the global default (``True``) directly. [ypid_]

- Fix role run with ``apache__deploy_state == "absent"`` after the role has
been run with ``present`` before. [ypid_]
4 changes: 2 additions & 2 deletions COPYRIGHT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
debops.apache - Manage and configure the Apache HTTP Server

Copyright (C) 2016 Robin Schneider <[email protected]>
Copyright (C) 2016 DebOps https://debops.org/
Copyright (C) 2016-2017 Robin Schneider <[email protected]>
Copyright (C) 2016-2017 DebOps https://debops.org/

This Ansible role is part of DebOps.

Expand Down
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
[![Ansible Galaxy](https://img.shields.io/badge/galaxy-debops.apache-660198.svg?style=flat)](https://galaxy.ansible.com/debops/apache)


The ``debops.apache`` role allows you to setup and mange the [Apache HTTP Server].
The ``debops.apache`` role allows you to setup and manage the [Apache HTTP Server]
with version 2.4 and above.

[Apache HTTP Server]: https://en.wikipedia.org/wiki/Apache_HTTP_Server

Expand Down Expand Up @@ -47,4 +48,4 @@ License: [GPL-3.0](https://tldrlegal.com/license/gnu-general-public-license-v3-%

***

This role is part of the [DebOps](https://debops.org/) project. README generated by [ansigenome](https://github.com/nickjj/ansigenome/).
This role is part of [DebOps](https://debops.org/). README generated by [ansigenome](https://github.com/nickjj/ansigenome/).
Loading