From d1e6332865ec3856176a230662d5e373373bb37e Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 28 Feb 2026 15:54:09 +0100 Subject: [PATCH] Recommit for updates in build 77 --- doc/file.README.html | 26 ++++++++++++++++++- doc/index.html | 26 ++++++++++++++++++- .../confdroid_nagios_3A_3Aparams.html | 10 +++---- 3 files changed, 55 insertions(+), 7 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index be632c6..da85cf0 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -71,6 +71,8 @@

Features

  • Repo Documentation

    @@ -119,7 +121,29 @@

    configuring user access

    -

    ToDo

    +

    Main access to the user interface requires defining an administrative user and password via ng_main_user and ng_main_password. The password should be encrypted like this:

    + +
    htpasswd -B -n  testuser
+New password: 
+Re-type new password:
+
    + +

    This results in

    + +
    testuser: $2y$05$rNy/P22OfYZlpdEPnCAIg.OUizRD34P7pDRwUGiaYjH44PcRuZ2ia
+
    + +

    Use that value to override the default password in ENC or Hiera, if you use it.

    + +

    Additional users

    + +

    The main user is automatically created. If you want to add more users, this should be done via the define confdroid_nagios::server::access. In your control repo, site.pp etc. address the access define like this:

    + +
    confdroid_nagios::server::access { 'example':
+  ng_htpasswd_user     => 'example_user',
+  ng_htpasswd_password => 'example_password_encrypted'
+}
+

    Repo Documentation

    diff --git a/doc/index.html b/doc/index.html index 9aff812..878ea09 100644 --- a/doc/index.html +++ b/doc/index.html @@ -71,6 +71,8 @@

    Features

  • Repo Documentation

    @@ -119,7 +121,29 @@

    configuring user access

    -

    ToDo

    +

    Main access to the user interface requires defining an administrative user and password via ng_main_user and ng_main_password. The password should be encrypted like this:

    + +
    htpasswd -B -n  testuser
+New password: 
+Re-type new password:
+
    + +

    This results in

    + +
    testuser: $2y$05$rNy/P22OfYZlpdEPnCAIg.OUizRD34P7pDRwUGiaYjH44PcRuZ2ia
+
    + +

    Use that value to override the default password in ENC or Hiera, if you use it.

    + +

    Additional users

    + +

    The main user is automatically created. If you want to add more users, this should be done via the define confdroid_nagios::server::access. In your control repo, site.pp etc. address the access define like this:

    + +
    confdroid_nagios::server::access { 'example':
+  ng_htpasswd_user     => 'example_user',
+  ng_htpasswd_password => 'example_password_encrypted'
+}
+

    Repo Documentation

    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index d4147f9..a6dd74d 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -434,13 +434,13 @@ class confdroid_nagios::params ( String $ng_main_password = 'nagios', # nagios.cfg - String $ng_log_file = '/var/log/nagios/nagios.log', + String $ng_log_file = '/var/log/nagios/nagios.log', # cgi.cfg String $ng_context_help = '1', # httpd - Boolean $ng_use_https = false, + Boolean $ng_use_https = false, ) { # Default facts @@ -504,14 +504,14 @@ class confdroid_nagios::params ( $ng_cntctgrps_rule_erb = 'confdroid_nagios/nagios/contactgroups_cfg_rule.erb' $ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg" $ng_nagios_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios' + $ng_htpasswd_file = "${ng_main_dir}/passwd" + $ng_htpasswd_head = 'confdroid_nagios/nagios/htpasswd_head.erb' + $ng_htpasswd_rule = 'confdroid_nagios/nagios/htpasswd_rule.erb' ## old $ng_main_config = "${ng_main_dir}/nagios.cfg" $ng_cgi_cfg_file = "${ng_main_dir}/cgi.cfg" $ng_cgi_cfg_erb = 'confdroid_nagios/nagios/cgi_cfg.erb' - $ng_htpasswd_file = "${ng_main_dir}/passwd" - $ng_htpasswd_head = 'confdroid_nagios/nagios/htpasswd_head.erb' - $ng_htpasswd_rule = 'confdroid_nagios/nagios/htpasswd_rule.erb' $ng_taccgi_erb = 'confdroid_nagios/selinux/taccgi.erb' $ng_statcgi_erb = 'confdroid_nagios/selinux/statuscgi.erb' $ng_statdat_erb = 'confdroid_nagios/selinux/statusdat.erb'