mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	puppet: Switch from $::fqdn to non-legacy $::networking.
This commit is contained in:
		
				
					committed by
					
						
						Alex Vandiver
					
				
			
			
				
	
			
			
			
						parent
						
							bb4c0799cc
						
					
				
				
					commit
					f2f4462e71
				
			@@ -2,10 +2,11 @@ class zulip::postfix_localmail {
 | 
			
		||||
  include zulip::snakeoil
 | 
			
		||||
  $postfix_packages = [ 'postfix', ]
 | 
			
		||||
 | 
			
		||||
  if $::fqdn == '' {
 | 
			
		||||
  $fqdn = $::networking['fqdn']
 | 
			
		||||
  if $fqdn == '' {
 | 
			
		||||
    fail('Your system does not have a fully-qualified domain name defined. See hostname(1).')
 | 
			
		||||
  }
 | 
			
		||||
  $postfix_mailname = zulipconf('postfix', 'mailname', $::fqdn)
 | 
			
		||||
  $postfix_mailname = zulipconf('postfix', 'mailname', $fqdn)
 | 
			
		||||
  package { $postfix_packages:
 | 
			
		||||
    ensure  => 'installed',
 | 
			
		||||
    require => File['/etc/mailname'],
 | 
			
		||||
@@ -20,7 +21,7 @@ class zulip::postfix_localmail {
 | 
			
		||||
    mode    => '0644',
 | 
			
		||||
    owner   => root,
 | 
			
		||||
    group   => root,
 | 
			
		||||
    content => $::fqdn,
 | 
			
		||||
    content => $fqdn,
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  file {'/etc/postfix/main.cf':
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user