Switch initialize to true in icingaweb2 setup

voxpupuli · Apr 18, 2016 · 41c46bd · 41c46bd
1 parent 3f25a73
commit 41c46bd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/manifests/initialize.pp b/manifests/initialize.pp
@@ -5,7 +5,7 @@
 class icingaweb2::initialize {
   if $::icingaweb2::initialize {
     case $::operatingsystem {
-      'RedHat', 'CentOS': {
+      'RedHat', 'CentOS', 'Debian', 'Ubuntu': {
         case $::icingaweb2::web_db {
           'mysql': {
 
@@ -16,13 +16,13 @@
             }
 
             exec { 'create db scheme':
-              command => "mysql --defaults-file='/root/.my.cnf' ${::icingaweb2::web_db_name} < ${sql_schema_location}",
-              unless  => "mysql --defaults-file='/root/.my.cnf' ${::icingaweb2::web_db_name} -e \"SELECT 1 FROM icingaweb_user LIMIT 1;\"",
+              command => "mysql -h ${::icingaweb2::web_db_host} -u${::icingaweb2::web_db_user} -p${::icingaweb2::web_db_pass} ${::icingaweb2::web_db_name} < ${sql_schema_location}",
+              unless  => "mysql -h ${::icingaweb2::web_db_host} -u${::icingaweb2::web_db_user} -p${::icingaweb2::web_db_pass} ${::icingaweb2::web_db_name} -e \"SELECT 1 FROM icingaweb_user LIMIT 1;\"",
               notify  => Exec['create web user']
             }
 
             exec { 'create web user':
-              command     => "mysql --defaults-file='/root/.my.cnf' ${::icingaweb2::web_db_name} -e \" INSERT INTO icingaweb_user (name, active, password_hash) VALUES ('icingaadmin', 1, '\\\$1\\\$EzxLOFDr\\\$giVx3bGhVm4lDUAw6srGX1');\"",
+              command     => "mysql -h ${::icingaweb2::web_db_host} -u${::icingaweb2::web_db_user} -p${::icingaweb2::web_db_pass} ${::icingaweb2::web_db_name} -e \" INSERT INTO icingaweb_user (name, active, password_hash) VALUES ('icingaadmin', 1, '\\\$1\\\$EzxLOFDr\\\$giVx3bGhVm4lDUAw6srGX1');\"",
               refreshonly => true,
             }
           }