paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet-lint: Enforce double_quoted_strings check.

Browse Source 
This makes our puppet codebase more consistent by using single-quoted
strings consistently.
This commit is contained in:
Tim Abbott
2018-08-13 12:29:40 -07:00
parent d0b51b70f4
commit 90828297e4
19 changed files with 311 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/zulip/manifests/app_frontend.pp
View File

@@ -3,15 +3,15 @@ class zulip::app_frontend {
include zulip::app_frontend_base
include zulip::app_frontend_once
$nginx_http_only = zulipconf("application_server", "http_only", undef)
$no_serve_uploads = zulipconf("application_server", "no_serve_uploads", undef)
$nginx_http_only = zulipconf('application_server', 'http_only', undef)
$no_serve_uploads = zulipconf('application_server', 'no_serve_uploads', undef)
file { '/etc/nginx/sites-available/zulip-enterprise':
ensure => file,
require => Package['nginx-full'],
owner => 'root',
group => 'root',
mode => '0644',
content => template("zulip/nginx/zulip-enterprise.template.erb"),
content => template('zulip/nginx/zulip-enterprise.template.erb'),
notify => Service['nginx'],
}
file { '/etc/logrotate.d/zulip':

2
puppet/zulip/manifests/apt_repository.pp
View File

@@ -1,6 +1,6 @@
# This depends on zulip::base having already been evaluated
class zulip::apt_repository {
if $zulip::base::release_name == "stretch" {
if $zulip::base::release_name == 'stretch' {
apt::source {'zulip':
location => 'https://packagecloud.io/zulip/server/debian/',
release => $zulip::base::release_name,

44
puppet/zulip_ops/manifests/apache.pp
View File

@@ -1,54 +1,54 @@
class zulip_ops::apache {
$apache_packages = [# Needed to run Apache with WSGI
"apache2",
"libapache2-mod-wsgi",
'apache2',
'libapache2-mod-wsgi',
]
package { $apache_packages: ensure => "installed" }
package { $apache_packages: ensure => 'installed' }
apache2mod { [ "headers", "proxy", "proxy_http", "rewrite", "auth_digest", "ssl" ]:
apache2mod { [ 'headers', 'proxy', 'proxy_http', 'rewrite', 'auth_digest', 'ssl' ]:
ensure => present,
require => Package['apache2'],
}
file { "/etc/apache2/users/":
file { '/etc/apache2/users/':
ensure => directory,
require => Package['apache2'],
owner => "www-data",
group => "www-data",
owner => 'www-data',
group => 'www-data',
mode => '0600',
}
file { "/etc/apache2/users/wiki":
file { '/etc/apache2/users/wiki':
ensure => file,
require => File["/etc/apache2/users/"],
owner => "www-data",
group => "www-data",
require => File['/etc/apache2/users/'],
owner => 'www-data',
group => 'www-data',
mode => '0600',
source => "puppet:///modules/zulip_ops/apache/users",
source => 'puppet:///modules/zulip_ops/apache/users',
}
file { "/etc/apache2/certs/":
file { '/etc/apache2/certs/':
ensure => directory,
require => Package['apache2'],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
}
file { "/etc/apache2/ports.conf":
file { '/etc/apache2/ports.conf':
ensure => file,
require => Package[apache2],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0640',
source => "puppet:///modules/zulip_ops/apache/ports.conf",
source => 'puppet:///modules/zulip_ops/apache/ports.conf',
}
file { "/etc/apache2/sites-available/":
file { '/etc/apache2/sites-available/':
ensure => directory,
require => Package[apache2],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0640',
}
}

48
puppet/zulip_ops/manifests/app_frontend.pp
View File

@@ -5,69 +5,69 @@ class zulip_ops::app_frontend {
include zulip::postfix_localmail
include zulip::static_asset_compiler
$app_packages = [# Needed for the ssh tunnel to the redis server
"autossh",
'autossh',
]
package { $app_packages: ensure => "installed" }
$hosts_domain = zulipconf("nagios", "hosts_domain", undef)
package { $app_packages: ensure => 'installed' }
$hosts_domain = zulipconf('nagios', 'hosts_domain', undef)
file { "/etc/logrotate.d/zulip":
file { '/etc/logrotate.d/zulip':
ensure => file,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip/logrotate/zulip",
source => 'puppet:///modules/zulip/logrotate/zulip',
}
file { '/etc/log2zulip.conf':
ensure => file,
owner => "zulip",
group => "zulip",
owner => 'zulip',
group => 'zulip',
mode => '0644',
source => 'puppet:///modules/zulip_ops/log2zulip.conf',
}
file { '/etc/cron.d/log2zulip':
ensure => file,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/zulip_ops/cron.d/log2zulip',
}
file { '/etc/cron.d/check_send_receive_time':
ensure => file,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/zulip_ops/cron.d/check_send_receive_time',
}
file { '/etc/log2zulip.zuliprc':
ensure => file,
owner => "zulip",
group => "zulip",
owner => 'zulip',
group => 'zulip',
mode => '0600',
source => 'puppet:///modules/zulip_ops/log2zulip.zuliprc',
}
file { "/etc/cron.d/check-apns-tokens":
file { '/etc/cron.d/check-apns-tokens':
ensure => absent,
}
file { "/etc/supervisor/conf.d/redis_tunnel.conf":
file { '/etc/supervisor/conf.d/redis_tunnel.conf':
ensure => file,
require => Package["supervisor", "autossh"],
owner => "root",
group => "root",
require => Package['supervisor', 'autossh'],
owner => 'root',
group => 'root',
mode => '0644',
content => template("zulip_ops/supervisor/conf.d/redis_tunnel.conf.template.erb"),
notify => Service["supervisor"],
content => template('zulip_ops/supervisor/conf.d/redis_tunnel.conf.template.erb'),
notify => Service['supervisor'],
}
# Need redis_password in its own file for Nagios
file { '/var/lib/nagios/redis_password':
ensure => file,
mode => '0600',
owner => "nagios",
group => "nagios",
owner => 'nagios',
group => 'nagios',
content => zulipsecret('secrets', 'redis_password', ''),
}

88
puppet/zulip_ops/manifests/base.pp
View File

@@ -3,41 +3,41 @@ class zulip_ops::base {
include zulip::apt_repository
$org_base_packages = [# Management for our systems
"openssh-server",
"mosh",
'openssh-server',
'mosh',
# package management
"aptitude",
'aptitude',
# SSL Certificates
"letsencrypt",
'letsencrypt',
# Monitoring
"munin-node",
"munin-plugins-extra" ,
'munin-node',
'munin-plugins-extra' ,
# Security
"iptables-persistent",
'iptables-persistent',
# For managing our current Debian packages
"debian-goodies",
'debian-goodies',
# Needed for zulip-ec2-configure-network-interfaces
'dhcpcd5',
"python3-six",
"python-six",
'python3-six',
'python-six',
# "python3-boto", # missing on trusty
"python-boto", # needed for postgres_common too
"python3-netifaces",
"python-netifaces",
'python-boto', # needed for postgres_common too
'python3-netifaces',
'python-netifaces',
# Popular editors
"vim",
"emacs-nox",
"puppet-el",
'vim',
'emacs-nox',
'puppet-el',
# Prevent accidental reboots
"molly-guard",
'molly-guard',
# Useful tools in a production environment
"screen",
"strace",
"host",
"git",
"nagios-plugins-contrib",
'screen',
'strace',
'host',
'git',
'nagios-plugins-contrib',
]
package { $org_base_packages: ensure => "installed" }
package { $org_base_packages: ensure => 'installed' }
# Add system users here
$users = []
@@ -60,8 +60,8 @@ class zulip_ops::base {
file { '/home/zulip/.ssh':
ensure => directory,
require => User['zulip'],
owner => "zulip",
group => "zulip",
owner => 'zulip',
group => 'zulip',
mode => '0600',
}
@@ -87,7 +87,7 @@ class zulip_ops::base {
ensure => running,
}
if $zulip::base::release_name == "xenial" {
if $zulip::base::release_name == 'xenial' {
# Our custom sshd_config uses options that don't exist on trusty.
file { '/etc/ssh/sshd_config':
ensure => file,
@@ -103,48 +103,48 @@ class zulip_ops::base {
file { '/root/.emacs':
ensure => file,
mode => '0600',
owner => "root",
group => "root",
owner => 'root',
group => 'root',
source => 'puppet:///modules/zulip_ops/dot_emacs.el',
}
file { '/home/zulip/.emacs':
ensure => file,
mode => '0600',
owner => "zulip",
group => "zulip",
owner => 'zulip',
group => 'zulip',
source => 'puppet:///modules/zulip_ops/dot_emacs.el',
require => User['zulip'],
}
if $zulip::base::release_name == "xenial" {
if $zulip::base::release_name == 'xenial' {
# TODO: Change this condition to something more coherent.
file { '/root/.ssh/authorized_keys':
ensure => file,
mode => '0600',
owner => "root",
group => "root",
owner => 'root',
group => 'root',
source => 'puppet:///modules/zulip_ops/root_authorized_keys',
}
file { '/home/zulip/.ssh/authorized_keys':
ensure => file,
require => File['/home/zulip/.ssh'],
mode => '0600',
owner => "zulip",
group => "zulip",
owner => 'zulip',
group => 'zulip',
source => 'puppet:///modules/zulip_ops/authorized_keys',
}
file { '/var/lib/nagios/.ssh/authorized_keys':
ensure => file,
require => File['/var/lib/nagios/.ssh'],
mode => '0600',
owner => "nagios",
group => "nagios",
owner => 'nagios',
group => 'nagios',
source => 'puppet:///modules/zulip_ops/nagios_authorized_keys',
}
}
if $zulip::base::release_name == "xenial" {
if $zulip::base::release_name == 'xenial' {
# This is a proxy for the fact that our xenial machines are the
# ones in EC2.
file { '/usr/local/sbin/zulip-ec2-configure-interfaces':
@@ -175,15 +175,15 @@ class zulip_ops::base {
file { '/var/lib/nagios/':
ensure => directory,
require => User['nagios'],
owner => "nagios",
group => "nagios",
owner => 'nagios',
group => 'nagios',
mode => '0600',
}
file { '/var/lib/nagios/.ssh':
ensure => directory,
require => File['/var/lib/nagios/'],
owner => "nagios",
group => "nagios",
owner => 'nagios',
group => 'nagios',
mode => '0600',
}
file { '/home/nagios':
@@ -191,7 +191,7 @@ class zulip_ops::base {
force => true,
recurse => true,
}
if $zulip::base::release_name == "xenial" {
if $zulip::base::release_name == 'xenial' {
# Trusty's puppet doesn't support the include? rule used in rules.v4.
file { '/etc/iptables/rules.v4':
ensure => file,
@@ -208,7 +208,7 @@ class zulip_ops::base {
# into thinking the service is *always* running (which in a way it is, as
# iptables is part of the kernel.)
hasstatus => true,
status => "/bin/true",
status => '/bin/true',
# Under Debian, the "restart" parameter does not reload the rules, so tell
# Puppet to fall back to stop/start, which does work.

2
puppet/zulip_ops/manifests/git.pp
View File

@@ -2,7 +2,7 @@ class zulip_ops::git {
include zulip_ops::base
$git_packages = [ ]
package { $git_packages: ensure => "installed" }
package { $git_packages: ensure => 'installed' }
file { '/home/git/repositories/eng/zulip.git/hooks':
ensure => 'directory',

36
puppet/zulip_ops/manifests/loadbalancer.pp
View File

@@ -3,51 +3,51 @@ class zulip_ops::loadbalancer {
include zulip::nginx
include zulip::camo
file { "/etc/nginx/sites-available/loadbalancer":
file { '/etc/nginx/sites-available/loadbalancer':
ensure => file,
require => Package["nginx-full"],
owner => "root",
group => "root",
require => Package['nginx-full'],
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/nginx/sites-available/loadbalancer",
notify => Service["nginx"],
source => 'puppet:///modules/zulip_ops/nginx/sites-available/loadbalancer',
notify => Service['nginx'],
}
file { "/etc/motd":
file { '/etc/motd':
ensure => file,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/motd.lb0",
source => 'puppet:///modules/zulip_ops/motd.lb0',
}
file { '/etc/nginx/sites-enabled/loadbalancer':
ensure => 'link',
require => Package["nginx-full"],
require => Package['nginx-full'],
target => '/etc/nginx/sites-available/loadbalancer',
notify => Service["nginx"],
notify => Service['nginx'],
}
file { '/etc/log2zulip.conf':
ensure => file,
owner => "zulip",
group => "zulip",
owner => 'zulip',
group => 'zulip',
mode => '0644',
source => 'puppet:///modules/zulip_ops/log2zulip.conf',
}
file { '/etc/cron.d/log2zulip':
ensure => file,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/zulip_ops/cron.d/log2zulip',
}
file { '/etc/log2zulip.zuliprc':
ensure => file,
owner => "zulip",
group => "zulip",
owner => 'zulip',
group => 'zulip',
mode => '0600',
source => 'puppet:///modules/zulip_ops/log2zulip.zuliprc',
}

40
puppet/zulip_ops/manifests/munin.pp
View File

@@ -2,41 +2,41 @@ class zulip_ops::munin {
include zulip::supervisor
$munin_packages = [# Packages needed for munin
"munin",
"autossh",
'munin',
'autossh',
# Packages needed for munin website
'libapache2-mod-fcgid',
]
package { $munin_packages: ensure => "installed" }
package { $munin_packages: ensure => 'installed' }
$hosts_domain = zulipconf("nagios", "hosts_domain", undef)
$hosts_domain = zulipconf('nagios', 'hosts_domain', undef)
$hosts = $zulip_ops::base::hosts
file { "/etc/munin":
require => Package["munin"],
file { '/etc/munin':
require => Package['munin'],
recurse => true,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/munin"
source => 'puppet:///modules/zulip_ops/munin'
}
file { "/etc/munin/munin.conf":
file { '/etc/munin/munin.conf':
ensure => file,
require => [ Package["munin"], File["/etc/munin"] ],
owner => "root",
group => "root",
require => [ Package['munin'], File['/etc/munin'] ],
owner => 'root',
group => 'root',
mode => '0644',
content => template("zulip_ops/munin/munin.conf.erb")
content => template('zulip_ops/munin/munin.conf.erb')
}
file { "/etc/supervisor/conf.d/munin_tunnels.conf":
file { '/etc/supervisor/conf.d/munin_tunnels.conf':
ensure => file,
require => Package["supervisor", "autossh"],
require => Package['supervisor', 'autossh'],
mode => '0644',
owner => "root",
group => "root",
content => template("zulip_ops/supervisor/conf.d/munin_tunnels.conf.erb"),
notify => Service["supervisor"]
owner => 'root',
group => 'root',
content => template('zulip_ops/supervisor/conf.d/munin_tunnels.conf.erb'),
notify => Service['supervisor']
}
}

134
puppet/zulip_ops/manifests/nagios.pp
View File

@@ -4,32 +4,32 @@ class zulip_ops::nagios {
include zulip::nagios
$nagios_packages = [# Packages needed for Nagios
"nagios3",
'nagios3',
# For sending outgoing email
"msmtp",
'msmtp',
]
package { $nagios_packages: ensure => "installed" }
$nagios_format_users = join($zulip_ops::base::users, ",")
$nagios_alert_email = zulipconf("nagios", "alert_email", undef)
$nagios_test_email = zulipconf("nagios", "test_email", undef)
$nagios_pager_email = zulipconf("nagios", "pager_email", undef)
package { $nagios_packages: ensure => 'installed' }
$nagios_format_users = join($zulip_ops::base::users, ',')
$nagios_alert_email = zulipconf('nagios', 'alert_email', undef)
$nagios_test_email = zulipconf('nagios', 'test_email', undef)
$nagios_pager_email = zulipconf('nagios', 'pager_email', undef)
$nagios_mail_domain = zulipconf("nagios", "mail_domain", undef)
$nagios_mail_host = zulipconf("nagios", "mail_host", undef)
$nagios_mail_password = zulipsecret("secrets", "nagios_mail_password", "")
$nagios_camo_check_url = zulipconf("nagios", "camo_check_url", undef)
$nagios_mail_domain = zulipconf('nagios', 'mail_domain', undef)
$nagios_mail_host = zulipconf('nagios', 'mail_host', undef)
$nagios_mail_password = zulipsecret('secrets', 'nagios_mail_password', '')
$nagios_camo_check_url = zulipconf('nagios', 'camo_check_url', undef)
$hosts_domain = zulipconf("nagios", "hosts_domain", undef)
$hosts_zmirror = split(zulipconf("nagios", "hosts_zmirror", undef), ",")
$hosts_zmirrorp = split(zulipconf("nagios", "hosts_zmirrorp", undef), ",")
$hosts_app_prod = split(zulipconf("nagios", "hosts_app_prod", undef), ",")
$hosts_app_staging = split(zulipconf("nagios", "hosts_app_staging", undef), ",")
$hosts_postgres_primary = split(zulipconf("nagios", "hosts_postgres_primary", undef), ",")
$hosts_postgres_secondary = split(zulipconf("nagios", "hosts_postgres_secondary", undef), ",")
$hosts_redis = split(zulipconf("nagios", "hosts_redis", undef), ",")
$hosts_loadbalancer = split(zulipconf("nagios", "hosts_loadbalancer", undef), ",")
$hosts_stats = split(zulipconf("nagios", "hosts_stats", undef), ",")
$hosts_fullstack = split(zulipconf("nagios", "hosts_fullstack", undef), ",")
$hosts_domain = zulipconf('nagios', 'hosts_domain', undef)
$hosts_zmirror = split(zulipconf('nagios', 'hosts_zmirror', undef), ',')
$hosts_zmirrorp = split(zulipconf('nagios', 'hosts_zmirrorp', undef), ',')
$hosts_app_prod = split(zulipconf('nagios', 'hosts_app_prod', undef), ',')
$hosts_app_staging = split(zulipconf('nagios', 'hosts_app_staging', undef), ',')
$hosts_postgres_primary = split(zulipconf('nagios', 'hosts_postgres_primary', undef), ',')
$hosts_postgres_secondary = split(zulipconf('nagios', 'hosts_postgres_secondary', undef), ',')
$hosts_redis = split(zulipconf('nagios', 'hosts_redis', undef), ',')
$hosts_loadbalancer = split(zulipconf('nagios', 'hosts_loadbalancer', undef), ',')
$hosts_stats = split(zulipconf('nagios', 'hosts_stats', undef), ',')
$hosts_fullstack = split(zulipconf('nagios', 'hosts_fullstack', undef), ',')
apache2site { 'nagios':
ensure => present,
@@ -38,52 +38,52 @@ class zulip_ops::nagios {
],
}
file { "/etc/nagios3/":
file { '/etc/nagios3/':
recurse => true,
purge => false,
require => Package[nagios3],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/nagios3/",
notify => Service["nagios3"],
source => 'puppet:///modules/zulip_ops/nagios3/',
notify => Service['nagios3'],
}
file { "/etc/nagios3/conf.d/contacts.cfg":
file { '/etc/nagios3/conf.d/contacts.cfg':
require => Package[nagios3],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
content => template("zulip_ops/nagios3/contacts.cfg.template.erb"),
notify => Service["nagios3"],
content => template('zulip_ops/nagios3/contacts.cfg.template.erb'),
notify => Service['nagios3'],
}
file { "/etc/nagios3/conf.d/hosts.cfg":
file { '/etc/nagios3/conf.d/hosts.cfg':
require => Package[nagios3],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
content => template("zulip_ops/nagios3/hosts.cfg.template.erb"),
notify => Service["nagios3"],
content => template('zulip_ops/nagios3/hosts.cfg.template.erb'),
notify => Service['nagios3'],
}
file { "/etc/nagios3/conf.d/localhost.cfg":
file { '/etc/nagios3/conf.d/localhost.cfg':
require => Package[nagios3],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
content => template("zulip_ops/nagios3/localhost.cfg.template.erb"),
notify => Service["nagios3"],
content => template('zulip_ops/nagios3/localhost.cfg.template.erb'),
notify => Service['nagios3'],
}
file { "/etc/nagios3/cgi.cfg":
file { '/etc/nagios3/cgi.cfg':
require => Package[nagios3],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
content => template("zulip_ops/nagios3/cgi.cfg.template.erb"),
notify => Service["nagios3"],
content => template('zulip_ops/nagios3/cgi.cfg.template.erb'),
notify => Service['nagios3'],
}
service { "nagios3":
service { 'nagios3':
ensure => running,
}
@@ -99,50 +99,50 @@ class zulip_ops::nagios {
file { '/etc/nagios3/conf.d/zulip_nagios.cfg':
ensure => file,
mode => '0644',
owner => "root",
group => "root",
owner => 'root',
group => 'root',
source => '/usr/local/share/zulip/integrations/nagios/zulip_nagios.cfg',
notify => Service["nagios3"],
notify => Service['nagios3'],
}
$hosts = $zulip_ops::base::hosts
file { '/etc/nagios3/conf.d/zulip_autossh.cfg':
ensure => file,
mode => '0644',
owner => "root",
group => "root",
owner => 'root',
group => 'root',
content => template('zulip_ops/nagios_autossh.template.erb'),
notify => Service["nagios3"],
notify => Service['nagios3'],
}
file { '/var/lib/nagios/msmtprc':
ensure => file,
mode => '0600',
owner => "nagios",
group => "nagios",
content => template("zulip_ops/msmtprc_nagios.template.erb"),
owner => 'nagios',
group => 'nagios',
content => template('zulip_ops/msmtprc_nagios.template.erb'),
require => File['/var/lib/nagios'],
}
exec { "fix_nagios_permissions":
command => "dpkg-statoverride --update --add nagios www-data 2710 /var/lib/nagios3/rw",
exec { 'fix_nagios_permissions':
command => 'dpkg-statoverride --update --add nagios www-data 2710 /var/lib/nagios3/rw',
unless => "bash -c 'ls -ld /var/lib/nagios3/rw | grep ^drwx--s--- -q'",
notify => Service["nagios3"],
notify => Service['nagios3'],
}
exec { "fix_nagios_permissions2":
command => "dpkg-statoverride --update --add nagios nagios 751 /var/lib/nagios3",
exec { 'fix_nagios_permissions2':
command => 'dpkg-statoverride --update --add nagios nagios 751 /var/lib/nagios3',
unless => "bash -c 'ls -ld /var/lib/nagios3 | grep ^drwxr-x--x -q'",
notify => Service["nagios3"],
notify => Service['nagios3'],
}
file { "/etc/apache2/sites-available/nagios.conf":
file { '/etc/apache2/sites-available/nagios.conf':
recurse => true,
purge => false,
require => Package[apache2],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0640',
content => template("zulip_ops/nagios_apache_site.conf.template.erb"),
content => template('zulip_ops/nagios_apache_site.conf.template.erb'),
}
# TODO: Install our API
}

12
puppet/zulip_ops/manifests/postgres_appdb.pp
View File

@@ -5,19 +5,19 @@ class zulip_ops::postgres_appdb {
file { "/etc/postgresql/${zulip::base::postgres_version}/main/pg_hba.conf":
ensure => file,
require => Package["postgresql-${zulip::base::postgres_version}"],
owner => "postgres",
group => "postgres",
owner => 'postgres',
group => 'postgres',
mode => '0640',
source => "puppet:///modules/zulip_ops/postgresql/pg_hba.conf",
source => 'puppet:///modules/zulip_ops/postgresql/pg_hba.conf',
}
file { "/usr/share/postgresql/${zulip::base::postgres_version}/zulip_nagios_setup.sql":
ensure => file,
require => Package["postgresql-${zulip::base::postgres_version}"],
owner => "postgres",
group => "postgres",
owner => 'postgres',
group => 'postgres',
mode => '0640',
source => "puppet:///modules/zulip_ops/postgresql/zulip_nagios_setup.sql",
source => 'puppet:///modules/zulip_ops/postgresql/zulip_nagios_setup.sql',
}
}

38
puppet/zulip_ops/manifests/postgres_common.pp
View File

@@ -2,44 +2,44 @@ class zulip_ops::postgres_common {
include zulip::postgres_common
$internal_postgres_packages = [# dependencies for our wal-e backup system
"lzop",
"pv",
"python3-pip",
"python-pip",
'lzop',
'pv',
'python3-pip',
'python-pip',
# "python3-gevent", # missing on trusty
"python-gevent",
'python-gevent',
]
package { $internal_postgres_packages: ensure => "installed" }
package { $internal_postgres_packages: ensure => 'installed' }
exec {"pip_wal-e":
exec {'pip_wal-e':
# On trusty, there is no python3-boto or python3-gevent package,
# so we keep our `wal-e` explicitly on Python 2 for now.
command => "/usr/bin/pip2 install git+git://github.com/zbenjamin/wal-e.git#egg=wal-e",
creates => "/usr/local/bin/wal-e",
command => '/usr/bin/pip2 install git+git://github.com/zbenjamin/wal-e.git#egg=wal-e',
creates => '/usr/local/bin/wal-e',
require => Package['python-pip', 'python-boto', 'python-gevent',
'lzop', 'pv'],
}
cron { "pg_backup_and_purge":
cron { 'pg_backup_and_purge':
ensure => present,
command => "/usr/local/bin/pg_backup_and_purge",
environment => "PATH=/bin:/usr/bin:/usr/local/bin",
command => '/usr/local/bin/pg_backup_and_purge',
environment => 'PATH=/bin:/usr/bin:/usr/local/bin',
hour => 5,
minute => 0,
target => "postgres",
user => "postgres",
target => 'postgres',
user => 'postgres',
require => [
File["/usr/local/bin/pg_backup_and_purge"],
File['/usr/local/bin/pg_backup_and_purge'],
Package[
"postgresql-${zulip::base::postgres_version}",
"python3-dateutil",
"python-dateutil"
'python3-dateutil',
'python-dateutil'
]
]
}
exec { "sysctl_p":
command => "/sbin/sysctl -p /etc/sysctl.d/40-postgresql.conf",
exec { 'sysctl_p':
command => '/sbin/sysctl -p /etc/sysctl.d/40-postgresql.conf',
subscribe => File['/etc/sysctl.d/40-postgresql.conf'],
refreshonly => true,
}

18
puppet/zulip_ops/manifests/postgres_master.pp
View File

@@ -3,10 +3,10 @@ class zulip_ops::postgres_master {
include zulip_ops::postgres_appdb
$master_packages = [# Packages needed for disk + RAID configuration
"xfsprogs",
"mdadm",
'xfsprogs',
'mdadm',
]
package { $master_packages: ensure => "installed" }
package { $master_packages: ensure => 'installed' }
file { '/etc/sysctl.d/40-postgresql.conf':
ensure => file,
@@ -16,7 +16,7 @@ class zulip_ops::postgres_master {
source => 'puppet:///modules/zulip_ops/postgresql/40-postgresql.conf.master',
}
file { "/root/setup_disks.sh":
file { '/root/setup_disks.sh':
ensure => file,
owner => 'root',
group => 'root',
@@ -24,14 +24,14 @@ class zulip_ops::postgres_master {
source => 'puppet:///modules/zulip_ops/postgresql/setup_disks.sh',
}
exec { "setup_disks":
command => "/root/setup_disks.sh",
require => Package["postgresql-${zulip::base::postgres_version}", "xfsprogs", "mdadm"],
creates => "/dev/md0"
exec { 'setup_disks':
command => '/root/setup_disks.sh',
require => Package["postgresql-${zulip::base::postgres_version}", 'xfsprogs', 'mdadm'],
creates => '/dev/md0'
}
# This one will probably fail most of the time
exec {"give_nagios_user_access":
exec {'give_nagios_user_access':
# lint:ignore:140chars
command => "su postgres -c -- bash -c 'psql -v ON_ERROR_STOP=1 zulip < /usr/share/postgresql/${zulip::base::postgres_version}/zulip_nagios_setup.sql' && touch /usr/share/postgresql/${zulip::base::postgres_version}/zulip_nagios_setup.sql.applied",
# lint:endignore

4
puppet/zulip_ops/manifests/postgres_slave.pp
View File

@@ -5,8 +5,8 @@ class zulip_ops::postgres_slave {
file { "/var/lib/postgresql/${zulip::base::postgres_version}/main/recovery.conf":
ensure => file,
require => Package["postgresql-${zulip::base::postgres_version}"],
owner => "postgres",
group => "postgres",
owner => 'postgres',
group => 'postgres',
mode => '0644',
source => 'puppet:///modules/zulip_ops/postgresql/recovery.conf',
}

24
puppet/zulip_ops/manifests/prod_app_frontend.pp
View File

@@ -3,31 +3,31 @@ class zulip_ops::prod_app_frontend {
include zulip_ops::app_frontend
include zulip::app_frontend_once
file { "/etc/nginx/sites-available/zulip":
file { '/etc/nginx/sites-available/zulip':
ensure => file,
require => Package["nginx-full"],
owner => "root",
group => "root",
require => Package['nginx-full'],
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/nginx/sites-available/zulip",
notify => Service["nginx"],
source => 'puppet:///modules/zulip_ops/nginx/sites-available/zulip',
notify => Service['nginx'],
}
file { '/etc/nginx/sites-enabled/zulip':
ensure => 'link',
require => Package["nginx-full"],
require => Package['nginx-full'],
target => '/etc/nginx/sites-available/zulip',
notify => Service["nginx"],
notify => Service['nginx'],
}
file { "/usr/lib/nagios/plugins/zulip_zephyr_mirror":
file { '/usr/lib/nagios/plugins/zulip_zephyr_mirror':
require => Package[nagios-plugins-basic],
recurse => true,
purge => true,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0755',
source => "puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror",
source => 'puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror',
}
# Prod has our Apple Push Notifications Service private key at

4
puppet/zulip_ops/manifests/redis.pp
View File

@@ -6,8 +6,8 @@ class zulip_ops::redis {
file { '/var/lib/nagios/redis_password':
ensure => file,
mode => '0600',
owner => "nagios",
group => "nagios",
owner => 'nagios',
group => 'nagios',
content => "${zulip::redis::redis_password}\n",
}
}

16
puppet/zulip_ops/manifests/staging_app_frontend.pp
View File

@@ -2,19 +2,19 @@ class zulip_ops::staging_app_frontend {
include zulip_ops::base
include zulip_ops::app_frontend
file { "/etc/nginx/sites-available/zulip-staging":
file { '/etc/nginx/sites-available/zulip-staging':
ensure => file,
require => Package["nginx-full"],
owner => "root",
group => "root",
require => Package['nginx-full'],
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/nginx/sites-available/zulip-staging",
notify => Service["nginx"],
source => 'puppet:///modules/zulip_ops/nginx/sites-available/zulip-staging',
notify => Service['nginx'],
}
file { '/etc/nginx/sites-enabled/zulip-staging':
ensure => 'link',
require => Package["nginx-full"],
require => Package['nginx-full'],
target => '/etc/nginx/sites-available/zulip-staging',
notify => Service["nginx"],
notify => Service['nginx'],
}
}

60
puppet/zulip_ops/manifests/zmirror.pp
View File

@@ -3,21 +3,21 @@ class zulip_ops::zmirror {
include zulip::supervisor
$zmirror_packages = [# Packages needed to run the mirror
"libzephyr4-krb5",
"zephyr-clients",
"krb5-config",
"krb5-user",
"debathena-kerberos-config",
"debathena-zephyr-config",
'libzephyr4-krb5',
'zephyr-clients',
'krb5-config',
'krb5-user',
'debathena-kerberos-config',
'debathena-zephyr-config',
# Packages needed to build pyzephyr
"libzephyr-dev",
"comerr-dev",
"python3-dev",
"python-dev",
"cython3",
"cython",
'libzephyr-dev',
'comerr-dev',
'python3-dev',
'python-dev',
'cython3',
'cython',
]
package { $zmirror_packages: ensure => "installed" }
package { $zmirror_packages: ensure => 'installed' }
apt::source {'debathena':
location => 'http://debathena.mit.edu/apt',
@@ -28,40 +28,40 @@ class zulip_ops::zmirror {
include_src => true,
}
file { "/etc/supervisor/conf.d/zmirror.conf":
file { '/etc/supervisor/conf.d/zmirror.conf':
ensure => file,
require => Package[supervisor],
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/supervisor/conf.d/zmirror.conf",
notify => Service["supervisor"],
source => 'puppet:///modules/zulip_ops/supervisor/conf.d/zmirror.conf',
notify => Service['supervisor'],
}
file { "/etc/cron.d/zephyr-mirror":
file { '/etc/cron.d/zephyr-mirror':
ensure => file,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/cron.d/zephyr-mirror",
source => 'puppet:///modules/zulip_ops/cron.d/zephyr-mirror',
}
file { "/etc/default/zephyr-clients.debathena":
file { '/etc/default/zephyr-clients.debathena':
ensure => file,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/zephyr-clients.debathena",
source => 'puppet:///modules/zulip_ops/zephyr-clients.debathena',
}
file { "/usr/lib/nagios/plugins/zulip_zephyr_mirror":
file { '/usr/lib/nagios/plugins/zulip_zephyr_mirror':
require => Package[nagios-plugins-basic],
recurse => true,
purge => true,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0755',
source => "puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror",
source => 'puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror',
}
# TODO: Do the rest of our setup, which includes at least:

46
puppet/zulip_ops/manifests/zmirror_personals.pp
View File

@@ -3,21 +3,21 @@ class zulip_ops::zmirror_personals {
include zulip::supervisor
$zmirror_packages = [# Packages needed to run the mirror
"libzephyr4-krb5",
"zephyr-clients",
"krb5-config",
"krb5-user",
"debathena-kerberos-config",
"debathena-zephyr-config",
'libzephyr4-krb5',
'zephyr-clients',
'krb5-config',
'krb5-user',
'debathena-kerberos-config',
'debathena-zephyr-config',
# Packages needed to build pyzephyr
"libzephyr-dev",
"comerr-dev",
"python3-dev",
"python-dev",
"cython3",
"cython",
'libzephyr-dev',
'comerr-dev',
'python3-dev',
'python-dev',
'cython3',
'cython',
]
package { $zmirror_packages: ensure => "installed" }
package { $zmirror_packages: ensure => 'installed' }
apt::source {'debathena':
location => 'http://debathena.mit.edu/apt',
@@ -31,26 +31,26 @@ class zulip_ops::zmirror_personals {
'/home/zulip/mirror_status']:
ensure => directory,
mode => '0644',
owner => "zulip",
group => "zulip",
owner => 'zulip',
group => 'zulip',
}
file { "/etc/cron.d/test_zephyr_personal_mirrors":
file { '/etc/cron.d/test_zephyr_personal_mirrors':
ensure => file,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0644',
source => "puppet:///modules/zulip_ops/cron.d/test_zephyr_personal_mirrors",
source => 'puppet:///modules/zulip_ops/cron.d/test_zephyr_personal_mirrors',
}
file { "/usr/lib/nagios/plugins/zulip_zephyr_mirror":
file { '/usr/lib/nagios/plugins/zulip_zephyr_mirror':
require => Package[nagios-plugins-basic],
recurse => true,
purge => true,
owner => "root",
group => "root",
owner => 'root',
group => 'root',
mode => '0755',
source => "puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror",
source => 'puppet:///modules/zulip_ops/nagios_plugins/zulip_zephyr_mirror',
}
# TODO: Do the rest of our setup, which includes at least:

1
tools/linter_lib/exclude.py
View File

@@ -15,7 +15,6 @@ EXCLUDED_FILES = [
]
PUPPET_CHECK_RULES_TO_EXCLUDE = [
"--no-double_quoted_strings-check",
"--no-documentation-check",
"--no-80chars-check",
]