mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	puppet: Detect CentOS for release_name.
This commit is contained in:
		@@ -20,18 +20,25 @@ class zulip::base {
 | 
				
			|||||||
  ]
 | 
					  ]
 | 
				
			||||||
  package { $base_packages: ensure => 'installed' }
 | 
					  package { $base_packages: ensure => 'installed' }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  $release_name = $::operatingsystemrelease ? {
 | 
					  case $::osfamily {
 | 
				
			||||||
    # Debian releases
 | 
					    'debian': {
 | 
				
			||||||
    /^7.[0-9]*/ => 'wheezy',
 | 
					      $release_name = $::operatingsystemrelease ? {
 | 
				
			||||||
    /^8.[0-9]*/ => 'jessie',
 | 
					        # Debian releases
 | 
				
			||||||
    /^9.[0-9]*/ => 'stretch',
 | 
					        /^7.[0-9]*/ => 'wheezy',
 | 
				
			||||||
    # Ubuntu releases
 | 
					        /^8.[0-9]*/ => 'jessie',
 | 
				
			||||||
    '12.04' => 'precise',
 | 
					        /^9.[0-9]*/ => 'stretch',
 | 
				
			||||||
    '14.04' => 'trusty',
 | 
					        # Ubuntu releases
 | 
				
			||||||
    '15.04' => 'vivid',
 | 
					        '12.04' => 'precise',
 | 
				
			||||||
    '15.10' => 'wily',
 | 
					        '14.04' => 'trusty',
 | 
				
			||||||
    '16.04' => 'xenial',
 | 
					        '15.04' => 'vivid',
 | 
				
			||||||
    '18.04' => 'bionic',
 | 
					        '15.10' => 'wily',
 | 
				
			||||||
 | 
					        '16.04' => 'xenial',
 | 
				
			||||||
 | 
					        '18.04' => 'bionic',
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    'redhat': {
 | 
				
			||||||
 | 
					      $release_name = "${::operatingsystem}${::operatingsystemmajrelease}"
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  $postgres_version = $release_name ? {
 | 
					  $postgres_version = $release_name ? {
 | 
				
			||||||
@@ -44,6 +51,7 @@ class zulip::base {
 | 
				
			|||||||
    'wily'    => '9.4',
 | 
					    'wily'    => '9.4',
 | 
				
			||||||
    'xenial'  => '9.5',
 | 
					    'xenial'  => '9.5',
 | 
				
			||||||
    'bionic'  => '10',
 | 
					    'bionic'  => '10',
 | 
				
			||||||
 | 
					    'CentOS7' => '10',
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  $normal_queues = [
 | 
					  $normal_queues = [
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user