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

Add new param to load additonal Apache modules #143

Merged
merged 3 commits into from
Aug 5, 2024
Merged

Add new param to load additonal Apache modules #143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e089d99
Add new param to load additonal Apache modules
lbetz Aug 4, 2024
31b59aa
Update manifests/web.pp
lbetz Aug 5, 2024
69b63c0
Merge branch 'main' into enhancement/add-param-apache-mods
lbetz Aug 5, 2024
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
9 changes: 9 additions & 0 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,7 @@ The following parameters are available in the `icinga::web` class:
* [`default_admin_pass`](#-icinga--web--default_admin_pass)
* [`db_pass`](#-icinga--web--db_pass)
* [`apache_cgi_pass_auth`](#-icinga--web--apache_cgi_pass_auth)
* [`apache_extra_mods`](#-icinga--web--apache_extra_mods)
* [`db_type`](#-icinga--web--db_type)
* [`db_host`](#-icinga--web--db_host)
* [`db_port`](#-icinga--web--db_port)
Expand Down Expand Up @@ -838,6 +839,14 @@ Data type: `Boolean`
Either turn on or off the apache cgi pass thru auth.
An option available since Apache v2.4.15 and required for authenticated access to the Icinga Web Api.

##### <a name="-icinga--web--apache_extra_mods"></a>`apache_extra_mods`

Data type: `Array[String]`

List of addational Apache modules to load.

Default value: `[]`

##### <a name="-icinga--web--db_type"></a>`db_type`

Data type: `Enum['mysql', 'pgsql']`
Expand Down
7 changes: 7 additions & 0 deletions manifests/web.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
# Either turn on or off the apache cgi pass thru auth.
# An option available since Apache v2.4.15 and required for authenticated access to the Icinga Web Api.
#
# @param apache_extra_mods
# List of addational Apache modules to load.
#
# @param db_type
# What kind of database type to use.
#
Expand Down Expand Up @@ -56,6 +59,7 @@
Boolean $manage_database = false,
Variant[Stdlib::Host, Array[Stdlib::Host]] $api_host = 'localhost',
String $api_user = 'icingaweb2',
Array[String] $apache_extra_mods = [],
lbetz marked this conversation as resolved.
Show resolved Hide resolved
) {
# install all required php extentions
# by icingaweb (done by package dependencies) before PHP
Expand Down Expand Up @@ -152,6 +156,9 @@
include apache::mod::proxy_http
include apache::mod::ssl

# Load additional modules
include prefix($apache_extra_mods, 'apache::mod::')
Copy link
Member

Choose a reason for hiding this comment

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

okay that's a nice hack that I haven't seen before <3


apache::custom_config { 'icingaweb2':
ensure => present,
content => template('icinga/apache_custom_default.conf.erb'),
Expand Down
Loading