mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	puppet/zulip_ops: Replace apt::source with setup-apt-repo-debathena.
Tweaked by tabbott to use a clearer name.
This commit is contained in:
		
							
								
								
									
										6
									
								
								puppet/zulip_ops/manifests/apt_repository_debathena.pp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								puppet/zulip_ops/manifests/apt_repository_debathena.pp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,6 @@
 | 
			
		||||
class zulip_ops::apt_repository_debathena {
 | 
			
		||||
  $setup_file = "${::scripts_path}/lib/setup-apt-repo-debathena"
 | 
			
		||||
  exec { 'setup_apt_repo_debathena':
 | 
			
		||||
    command => "bash -c '${setup_file}'",
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
class zulip_ops::zmirror {
 | 
			
		||||
  include zulip_ops::base
 | 
			
		||||
  include zulip_ops::apt_repository_debathena
 | 
			
		||||
  include zulip::supervisor
 | 
			
		||||
 | 
			
		||||
  $zmirror_packages = [# Packages needed to run the mirror
 | 
			
		||||
@@ -17,7 +18,10 @@ class zulip_ops::zmirror {
 | 
			
		||||
    'cython3',
 | 
			
		||||
    'cython',
 | 
			
		||||
  ]
 | 
			
		||||
  package { $zmirror_packages: ensure => 'installed' }
 | 
			
		||||
  package { $zmirror_packages:
 | 
			
		||||
    ensure  => 'installed',
 | 
			
		||||
    require => Exec['setup_apt_repo_debathena'],
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  apt::source {'debathena':
 | 
			
		||||
    location    => 'http://debathena.mit.edu/apt',
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
class zulip_ops::zmirror_personals {
 | 
			
		||||
  include zulip_ops::base
 | 
			
		||||
  include zulip_ops::apt_repository_debathena
 | 
			
		||||
  include zulip::supervisor
 | 
			
		||||
 | 
			
		||||
  $zmirror_packages = [# Packages needed to run the mirror
 | 
			
		||||
@@ -17,16 +18,11 @@ class zulip_ops::zmirror_personals {
 | 
			
		||||
    'cython3',
 | 
			
		||||
    'cython',
 | 
			
		||||
  ]
 | 
			
		||||
  package { $zmirror_packages: ensure => 'installed' }
 | 
			
		||||
 | 
			
		||||
  apt::source {'debathena':
 | 
			
		||||
    location    => 'http://debathena.mit.edu/apt',
 | 
			
		||||
    release     => 'xenial',
 | 
			
		||||
    repos       => 'debathena debathena-config',
 | 
			
		||||
    key         => 'D1CD49BDD30B677273A75C66E4EE62700D8A9E8F',
 | 
			
		||||
    key_source  => 'https://debathena.mit.edu/apt/debathena-archive.asc',
 | 
			
		||||
    include_src => true,
 | 
			
		||||
  package { $zmirror_packages:
 | 
			
		||||
    ensure  => 'installed',
 | 
			
		||||
    require => Exec['setup_apt_repo_debathena'],
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  file { ['/home/zulip/api-keys', '/home/zulip/zephyr_sessions', '/home/zulip/ccache',
 | 
			
		||||
          '/home/zulip/mirror_status']:
 | 
			
		||||
    ensure => directory,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user