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

Two small fixes #16

Open
wants to merge 2 commits into
base: production
Choose a base branch
from
Open

Two small fixes #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d7286e
Fixup illegal comma separated argument list in manifests/nagios_resou…
buzzdeee Jan 19, 2016
1e4ead4
Fixup template warnings:
buzzdeee Jan 20, 2016
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
4 changes: 2 additions & 2 deletions manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

class icinga::install {

$ido_db_server = $::icinga::ido_db_server,
$manage_repo = $::icinga::manage_repo,
$ido_db_server = $::icinga::ido_db_server
$manage_repo = $::icinga::manage_repo
$gui_type = $::icinga::gui_type

case $::osfamily {
Expand Down
4 changes: 2 additions & 2 deletions manifests/nagios_resources.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
class icinga::nagios_resources (
) {

$icinga_user = $::icinga::icinga_user,
$icinga_group = $::icinga::icinga_group,
$icinga_user = $::icinga::icinga_user
$icinga_group = $::icinga::icinga_group

$nagios_resource_files = [
'/etc/nagios/nagios_command.cfg',
Expand Down
4 changes: 2 additions & 2 deletions templates/etc/icinga-web/conf.d/databases.xml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
Overwrite the icinga-web database (where users, roles, views, etc are stored
-->
<db:database name="icinga_web" class="AppKitDoctrineDatabase">
<ae:parameter name="dsn"><%= @web_db_server %>://<%= @web_db_user %>:<%= @web_db_pass %>@<%= @web_db_host %>:<%- if @web_db_server == 'pgsql' and web_db_port == 3306 -%>5432<%- else -%><%= @web_db_port %><%- end -%>/<%= @web_db_name %></ae:parameter>
<ae:parameter name="dsn"><%= @web_db_server %>://<%= @web_db_user %>:<%= @web_db_pass %>@<%= @web_db_host %>:<%- if @web_db_server == 'pgsql' and @web_db_port == 3306 -%>5432<%- else -%><%= @web_db_port %><%- end -%>/<%= @web_db_name %></ae:parameter>
<ae:parameter name="charset">utf8</ae:parameter>
<ae:parameter name="manager_attributes">
<ae:parameter name="Doctrine_Core::ATTR_MODEL_LOADING">CONSERVATIVE</ae:parameter>
Expand All @@ -43,7 +43,7 @@
EXAMPLE (oracle needs icingaOracle as the db driver)
-->
<db:database xmlns="http://agavi.org/agavi/config/parts/databases/1.0" name="icinga" class="IcingaDoctrineDatabase">
<ae:parameter name="dsn"><%= @ido_db_server %>://<%= @ido_db_user %>:<%= @ido_db_pass %>@<%= @ido_db_host %>:<%- if @ido_db_server == 'pgsql' and ido_db_port == 3306 -%>5432<%- else -%><%= @ido_db_port %><%- end -%>/<%= @ido_db_name %></ae:parameter>
<ae:parameter name="dsn"><%= @ido_db_server %>://<%= @ido_db_user %>:<%= @ido_db_pass %>@<%= @ido_db_host %>:<%- if @ido_db_server == 'pgsql' and @ido_db_port == 3306 -%>5432<%- else -%><%= @ido_db_port %><%- end -%>/<%= @ido_db_name %></ae:parameter>
<ae:parameter name="prefix">icinga_</ae:parameter>
<ae:parameter name="charset">utf8</ae:parameter>
<ae:parameter name="use_retained">true</ae:parameter>
Expand Down