File tree Expand file tree Collapse file tree 4 files changed +54
-3
lines changed Expand file tree Collapse file tree 4 files changed +54
-3
lines changed Original file line number Diff line number Diff line change 3131      command  =  'equery -q -C list -F \'$version\' rsyslog' 
3232      version  =  Facter ::Util ::Resolution . exec ( command ) 
3333      Regexp . last_match ( 1 )  if  version  =~ %r{^(.+)$} 
34+     when  "Solaris" 
35+       command = 'pkg info rsyslog 2>/dev/null| grep Version:' 
36+       version  =  Facter ::Util ::Resolution . exec ( command ) . strip . split [ 1 ] 
37+       Regexp . last_match ( 1 )  version  =~ /^([\d .]+)$/ 
3438    end 
3539  end 
3640end 
Original file line number Diff line number Diff line change 3131    content  => template (" ${module_name} /rsyslog.conf.erb" 
3232  }
3333
34-   file  { $rsyslog::rsyslog_default :
35-     ensure   => file ,
36-     content  => template (" ${module_name} /${rsyslog::rsyslog_default_file} .erb" 
34+   if  $rsyslog::rsyslog_default_file  {
35+     file  { $rsyslog::rsyslog_default :
36+       ensure   => file ,
37+       owner    => ' root' 
38+       group    => $rsyslog::run_group ,
39+       content  => template (" ${module_name} /${rsyslog::rsyslog_default_file} .erb" 
40+       require  => Class[' rsyslog::install' 
41+       notify   => Class[' rsyslog::service' 
42+     }
3743  }
3844
3945  file  { $rsyslog::spool_dir :
Original file line number Diff line number Diff line change 281281          $im_journal_ignore_previous_messages  = undef 
282282          $im_journal_statefile                 = undef 
283283        }
284+         solaris:  {
285+           $rsyslog_package_name    = ' rsyslog' 
286+           $relp_package_name       = false 
287+           $mysql_package_name      = false 
288+           $pgsql_package_name      = false 
289+           $gnutls_package_name     = false 
290+           $package_status          = ' latest' 
291+           $rsyslog_d               = ' /etc/rsyslog.d/' 
292+           $rsyslog_conf            = ' /etc/rsyslog.conf' 
293+           $rsyslog_default         = false 
294+           $default_config_file     = false 
295+           $run_user                = ' root' 
296+           $run_group               = ' root' 
297+           $log_user                = ' root' 
298+           $log_group               = ' sys' 
299+           $log_style               = ' debian' 
300+           $umask                   = false 
301+           $perm_file               = ' 0640' 
302+           $perm_dir                = ' 0755' 
303+           $spool_dir               = ' /var/spool/rsyslog' 
304+           $service_name            = ' rsyslog' 
305+           $client_conf             = ' client' 
306+           $server_conf             = ' server' 
307+           $ssl                     = false 
308+           $modules                 = [
309+             ' #$ModLoad immark    # provides --MARK-- message capability' 
310+             ' #$ModLoad imuxsock  # can be used for rate-limiting and flow-control' 
311+             ' $ModLoad imsolaris  # for Solaris kernel logging' 
312+           ]
313+           $service_hasrestart      = true 
314+           $service_hasstatus       = true 
315+           $omit_local_logging      = false 
316+         }
284317        default:  {
285318          fail(" The ${module_name}  module is not supported on ${::osfamily} /${::operatingsystem} ." 
286319        }
Original file line number Diff line number Diff line change 1111#   class { 'rsyslog::service': }
1212# 
1313class  rsyslog::service  {
14+   if  $::operatingsystem  == " Solaris" 
15+     service  { 'svc:/system/system-log:default' :
16+       ensure   => stopped,
17+       enable   => false ,
18+       before   => Service[$rsyslog::service_name ],
19+       require  => Package[$rsyslog::rsyslog_package_name ],
20+     }
21+   }
1422  service { $rsyslog::service_name :
1523    ensure      => running ,
1624    enable      => true ,
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments