소스 검색

Style fixes

Tom De Vylder 9 년 전
부모
커밋
a5b6188f3f
3개의 변경된 파일7개의 추가작업 그리고 9개의 파일을 삭제
  1. 2 2
      manifests/config.pp
  2. 3 3
      manifests/params.pp
  3. 2 4
      spec/classes/icingaweb2_spec.rb

+ 2 - 2
manifests/config.pp

@@ -37,8 +37,8 @@ class icingaweb2::config {
       content => template('icingaweb2/roles.ini.erb');
 
     $::icingaweb2::web_root:
-      ensure  => directory,
-      mode    => $::icingaweb2::config_dir_mode;
+      ensure => directory,
+      mode   => $::icingaweb2::config_dir_mode;
   }
 }
 

+ 3 - 3
manifests/params.pp

@@ -15,22 +15,22 @@ class icingaweb2::params {
   $ido_db_user = 'icingaweb2'
   $ido_type    = 'db'
 
-  $web_type      = 'db'
+  $web_db        = 'mysql'
   $web_db_host   = 'localhost'
   $web_db_name   = 'icingaweb2'
   $web_db_pass   = 'icingaweb2'
   $web_db_port   = '3306'
   $web_db_prefix = 'icingaweb2_'
-  $web_db        = 'mysql'
   $web_db_user   = 'icingaweb2'
+  $web_type      = 'db'
 
   case $::osfamily {
     'RedHat': {
       $config_dir         = '/etc/icingaweb2'
       $config_dir_mode    = '0755'
       $config_dir_recurse = false
+      $config_file_mode   = '0644'
       $config_group       = 'root'
-      $config_mode        = '0644'
       $config_user        = 'root'
       $pkg_deps           = []
       $pkg_ensure         = present

+ 2 - 4
spec/classes/icingaweb2_spec.rb

@@ -22,14 +22,12 @@ describe 'icingaweb2', :type => :class do
     it { should contain_class('icingaweb2::preinstall') }
 
     it { should contain_file('/etc/icingaweb2') }
-    it { should contain_file('/etc/icingaweb2/enabledModules') }
-    it { should contain_file('/etc/icingaweb2/modules') }
-
     it { should contain_file('/etc/icingaweb2/authentication.ini') }
     it { should contain_file('/etc/icingaweb2/config.ini') }
+    it { should contain_file('/etc/icingaweb2/enabledModules') }
+    it { should contain_file('/etc/icingaweb2/modules') }
     it { should contain_file('/etc/icingaweb2/resources.ini') }
     it { should contain_file('/etc/icingaweb2/roles.ini') }
-
     it { should contain_file('/usr/share/icingaweb2') }
   end