mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	puppet: Drop all log2zulip configuration.
Disabled on webservers in 047817b6b0, it has since lingered in
configuration, as well as running (to no effect) every minute on the
loadbalancer.
Remove the vestiges of its configuration.
			
			
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							b431b1b021
						
					
				
				
					commit
					c8df9a150e
				
			@@ -1,3 +0,0 @@
 | 
			
		||||
MAILTO=root
 | 
			
		||||
 | 
			
		||||
* * * * *   zulip cd /home/zulip/deployments/current && python3 ./zulip-current-venv/share/zulip/integrations/log2zulip/log2zulip
 | 
			
		||||
@@ -1 +0,0 @@
 | 
			
		||||
["/var/log/nginx/error.log"]
 | 
			
		||||
@@ -1,4 +0,0 @@
 | 
			
		||||
[api]
 | 
			
		||||
email = log-bot@zulip.com
 | 
			
		||||
key = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 | 
			
		||||
site = https://zulip.com
 | 
			
		||||
@@ -18,22 +18,6 @@ class zulip_ops::app_frontend {
 | 
			
		||||
    source => 'puppet:///modules/zulip/logrotate/zulip',
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  file { '/etc/log2zulip.conf':
 | 
			
		||||
    ensure => file,
 | 
			
		||||
    owner  => 'zulip',
 | 
			
		||||
    group  => 'zulip',
 | 
			
		||||
    mode   => '0644',
 | 
			
		||||
    source => 'puppet:///modules/zulip_ops/log2zulip.conf',
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  file { '/etc/log2zulip.zuliprc':
 | 
			
		||||
    ensure => file,
 | 
			
		||||
    owner  => 'zulip',
 | 
			
		||||
    group  => 'zulip',
 | 
			
		||||
    mode   => '0600',
 | 
			
		||||
    source => 'puppet:///modules/zulip_ops/log2zulip.zuliprc',
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  file { '/etc/supervisor/conf.d/redis_tunnel.conf':
 | 
			
		||||
    ensure  => file,
 | 
			
		||||
    require => Package['supervisor', 'autossh'],
 | 
			
		||||
 
 | 
			
		||||
@@ -20,27 +20,8 @@ class zulip_ops::loadbalancer {
 | 
			
		||||
    notify  => Service['nginx'],
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  file { '/etc/log2zulip.conf':
 | 
			
		||||
    ensure => file,
 | 
			
		||||
    owner  => 'zulip',
 | 
			
		||||
    group  => 'zulip',
 | 
			
		||||
    mode   => '0644',
 | 
			
		||||
    source => 'puppet:///modules/zulip_ops/log2zulip.conf',
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  # Can be removed if you see it deployed:
 | 
			
		||||
  file { '/etc/cron.d/log2zulip':
 | 
			
		||||
    ensure => file,
 | 
			
		||||
    owner  => 'root',
 | 
			
		||||
    group  => 'root',
 | 
			
		||||
    mode   => '0644',
 | 
			
		||||
    source => 'puppet:///modules/zulip_ops/cron.d/log2zulip',
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  file { '/etc/log2zulip.zuliprc':
 | 
			
		||||
    ensure => file,
 | 
			
		||||
    owner  => 'zulip',
 | 
			
		||||
    group  => 'zulip',
 | 
			
		||||
    mode   => '0600',
 | 
			
		||||
    source => 'puppet:///modules/zulip_ops/log2zulip.zuliprc',
 | 
			
		||||
    ensure => absent,
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user