[icinga-checkins] icinga.org: icinga2-ansible/master: Better documentation for icinga2_classicui_password variable

git at icinga.org git at icinga.org
Tue Jun 10 17:13:20 CEST 2014


Module: icinga2-ansible
Branch: master
Commit: 9f26a11274a9d6091d2fbb42cbc98ea51161b3a3
URL:    https://git.icinga.org/?p=icinga2-ansible.git;a=commit;h=9f26a11274a9d6091d2fbb42cbc98ea51161b3a3

Author: Valentino Gagliardi <valentino.g at servermanaged.it>
Date:   Tue Jun 10 17:12:14 2014 +0200

Better documentation for icinga2_classicui_password variable

---

 README.md                                  |    6 ++++++
 tasks/icinga2_classicui_install_Debian.yml |    2 +-
 tasks/icinga2_classicui_install_Ubuntu.yml |    2 +-
 vars/Debian_wheezy.yml                     |    6 ++++--
 vars/Ubuntu_trusty.yml                     |    4 ++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 5de607e..049fd00 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,12 @@ The variables that can be passed to this role:
 |-----------------------|----------------|
 |icinga2_classicui: ""	| yes/no         |
 
+The variables that you are required to configure:
+
+File `vars/Ubuntu_trusty.yml` and `vars/Debian_wheezy.yml`
+
+icinga2_classicui_password: "CHANGEME"
+
 Dependencies
 ------------
 
diff --git a/tasks/icinga2_classicui_install_Debian.yml b/tasks/icinga2_classicui_install_Debian.yml
index f2a2e25..ec910ff 100644
--- a/tasks/icinga2_classicui_install_Debian.yml
+++ b/tasks/icinga2_classicui_install_Debian.yml
@@ -2,7 +2,7 @@
 - name: Configure Debconf values for Icinga Classic Gui on Debian OS family
   debconf: name={{ item.name }}
            question={{ item.question }}
-           value={{ item.value }}
+           value={{ item.icinga2_classicui_password }}
            vtype={{ item.vtype }}
            unseen=no
   with_items: icinga2_classicui_debconf
diff --git a/tasks/icinga2_classicui_install_Ubuntu.yml b/tasks/icinga2_classicui_install_Ubuntu.yml
index 6a13773..cad84e1 100644
--- a/tasks/icinga2_classicui_install_Ubuntu.yml
+++ b/tasks/icinga2_classicui_install_Ubuntu.yml
@@ -2,7 +2,7 @@
 - name: Configure Debconf values for Icinga Classic Gui on Debian OS family (Ubuntu)
   debconf: name={{ item.name }}
            question={{ item.question }}
-           value={{ item.value }}
+           value={{ item.icinga2_classicui_password }}
            vtype={{ item.vtype }}
            unseen=no
   with_items: icinga2_classicui_debconf
diff --git a/vars/Debian_wheezy.yml b/vars/Debian_wheezy.yml
index de63321..a029eab 100644
--- a/vars/Debian_wheezy.yml
+++ b/vars/Debian_wheezy.yml
@@ -10,6 +10,8 @@ icinga2_repo_keys:
 
 apache: "apache2"
 
+#
+
 icinga2_repos:
  - { repo: "deb http://packages.icinga.org/debian icinga-wheezy main" }
  - { repo: "deb-src http://packages.icinga.org/debian icinga-wheezy main" }
@@ -22,8 +24,8 @@ icinga2_pkg:
  - { package: "nagios-nrpe-server" }
 
 icinga2_classicui_debconf:
- - { name: "icinga2-classicui", question: "icinga2-classicui/adminpassword", value: "CHANGEME", vtype: "string" }
- - { name: "icinga2-classicui", question: "icinga2-classicui/adminpassword-repeat", value: "CHANGEME", vtype: "string" }
+ - { name: "icinga2-classicui", question: "icinga2-classicui/adminpassword", icinga2_classicui_password: "CHANGEME", vtype: "string" }
+ - { name: "icinga2-classicui", question: "icinga2-classicui/adminpassword-repeat", icinga2_classicui_password: "CHANGEME", vtype: "string" }
 
 icinga2_web_pkg:
  - { package: "icinga2-classicui" }
diff --git a/vars/Ubuntu_trusty.yml b/vars/Ubuntu_trusty.yml
index b5b29ab..58876f6 100644
--- a/vars/Ubuntu_trusty.yml
+++ b/vars/Ubuntu_trusty.yml
@@ -18,8 +18,8 @@ icinga2_pkg:
  - { package: "nagios-nrpe-server" }
 
 icinga2_classicui_debconf:
- - { name: "icinga2-classicui", question: "icinga2-classicui/adminpassword", value: "CHANGEME", vtype: "string" }
- - { name: "icinga2-classicui", question: "icinga2-classicui/adminpassword-repeat", value: "CHANGEME", vtype: "string" }
+ - { name: "icinga2-classicui", question: "icinga2-classicui/adminpassword", icinga2_classicui_password: "CHANGEME", vtype: "string" }
+ - { name: "icinga2-classicui", question: "icinga2-classicui/adminpassword-repeat", icinga2_classicui_password: "CHANGEME", vtype: "string" }
 
 icinga2_web_pkg:
  - { package: "icinga2-classicui" }



More information about the icinga-checkins mailing list