paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet-lint: Enforce 2sp_soft_tables puppet-lint check.

Browse Source 
This cleans up the puppet codebase's whitespace formatting to be more
consistent.
This commit is contained in:
Tim Abbott
2018-08-13 12:27:41 -07:00
parent b26e0a957d
commit d0b51b70f4
10 changed files with 94 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
puppet/zulip/manifests/app_frontend_base.pp
View File

@@ -77,8 +77,7 @@ class zulip::app_frontend_base {
notify => Service['supervisor'], notify => Service['supervisor'],
} }
$uwsgi_processes = zulipconf('application_server', 'uwsgi_processes', $uwsgi_processes = zulipconf('application_server', 'uwsgi_processes', $uwsgi_default_processes)
$uwsgi_default_processes)
file { '/etc/zulip/uwsgi.ini': file { '/etc/zulip/uwsgi.ini':
ensure => file, ensure => file,
require => Package[supervisor], require => Package[supervisor],

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

@@ -55,8 +55,10 @@ class zulip::postgres_common {
@user { 'postgres': @user { 'postgres':
groups => ['ssl-cert'], groups => ['ssl-cert'],
membership => minimum, membership => minimum,
require => [Package["postgresql-${zulip::base::postgres_version}"], require => [
Package['ssl-cert']], Package["postgresql-${zulip::base::postgres_version}"],
Package['ssl-cert']
],
} }
User <| title == postgres |> { groups +> 'zulip' } User <| title == postgres |> { groups +> 'zulip' }
} }

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

@@ -5,8 +5,8 @@ class zulip_ops::app_frontend {
include zulip::postfix_localmail include zulip::postfix_localmail
include zulip::static_asset_compiler include zulip::static_asset_compiler
$app_packages = [# Needed for the ssh tunnel to the redis server $app_packages = [# Needed for the ssh tunnel to the redis server
"autossh", "autossh",
] ]
package { $app_packages: ensure => "installed" } package { $app_packages: ensure => "installed" }
$hosts_domain = zulipconf("nagios", "hosts_domain", undef) $hosts_domain = zulipconf("nagios", "hosts_domain", undef)

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

@@ -3,40 +3,40 @@ class zulip_ops::base {
include zulip::apt_repository include zulip::apt_repository
$org_base_packages = [# Management for our systems $org_base_packages = [# Management for our systems
"openssh-server", "openssh-server",
"mosh", "mosh",
# package management # package management
"aptitude", "aptitude",
# SSL Certificates # SSL Certificates
"letsencrypt", "letsencrypt",
# Monitoring # Monitoring
"munin-node", "munin-node",
"munin-plugins-extra" , "munin-plugins-extra" ,
# Security # Security
"iptables-persistent", "iptables-persistent",
# For managing our current Debian packages # For managing our current Debian packages
"debian-goodies", "debian-goodies",
# Needed for zulip-ec2-configure-network-interfaces # Needed for zulip-ec2-configure-network-interfaces
'dhcpcd5', 'dhcpcd5',
"python3-six", "python3-six",
"python-six", "python-six",
# "python3-boto", # missing on trusty # "python3-boto", # missing on trusty
"python-boto", # needed for postgres_common too "python-boto", # needed for postgres_common too
"python3-netifaces", "python3-netifaces",
"python-netifaces", "python-netifaces",
# Popular editors # Popular editors
"vim", "vim",
"emacs-nox", "emacs-nox",
"puppet-el", "puppet-el",
# Prevent accidental reboots # Prevent accidental reboots
"molly-guard", "molly-guard",
# Useful tools in a production environment # Useful tools in a production environment
"screen", "screen",
"strace", "strace",
"host", "host",
"git", "git",
"nagios-plugins-contrib", "nagios-plugins-contrib",
] ]
package { $org_base_packages: ensure => "installed" } package { $org_base_packages: ensure => "installed" }
# Add system users here # Add system users here

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

@@ -2,11 +2,11 @@ class zulip_ops::munin {
include zulip::supervisor include zulip::supervisor
$munin_packages = [# Packages needed for munin $munin_packages = [# Packages needed for munin
"munin", "munin",
"autossh", "autossh",
# Packages needed for munin website # Packages needed for munin website
'libapache2-mod-fcgid', '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)

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

@@ -88,11 +88,11 @@ class zulip_ops::nagios {
} }
file { [ '/etc/nagios3/conf.d/extinfo_nagios2.cfg', file { [ '/etc/nagios3/conf.d/extinfo_nagios2.cfg',
'/etc/nagios3/conf.d/services_nagios2.cfg', '/etc/nagios3/conf.d/services_nagios2.cfg',
'/etc/nagios3/conf.d/contacts_nagios2.cfg', '/etc/nagios3/conf.d/contacts_nagios2.cfg',
'/etc/nagios3/conf.d/hostgroups_nagios2.cfg', '/etc/nagios3/conf.d/hostgroups_nagios2.cfg',
'/etc/nagios3/conf.d/localhost_nagios2.cfg', '/etc/nagios3/conf.d/localhost_nagios2.cfg',
]: ]:
ensure => absent, ensure => absent,
} }

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

@@ -2,13 +2,13 @@ class zulip_ops::postgres_common {
include zulip::postgres_common include zulip::postgres_common
$internal_postgres_packages = [# dependencies for our wal-e backup system $internal_postgres_packages = [# dependencies for our wal-e backup system
"lzop", "lzop",
"pv", "pv",
"python3-pip", "python3-pip",
"python-pip", "python-pip",
# "python3-gevent", # missing on trusty # "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":
@@ -28,11 +28,14 @@ class zulip_ops::postgres_common {
minute => 0, minute => 0,
target => "postgres", target => "postgres",
user => "postgres", user => "postgres",
require => [ File["/usr/local/bin/pg_backup_and_purge"], require => [
Package["postgresql-${zulip::base::postgres_version}", File["/usr/local/bin/pg_backup_and_purge"],
"python3-dateutil", Package[
"python-dateutil" "postgresql-${zulip::base::postgres_version}",
] ] "python3-dateutil",
"python-dateutil"
]
]
} }
exec { "sysctl_p": exec { "sysctl_p":

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

@@ -3,20 +3,20 @@ class zulip_ops::zmirror {
include zulip::supervisor include zulip::supervisor
$zmirror_packages = [# Packages needed to run the mirror $zmirror_packages = [# Packages needed to run the mirror
"libzephyr4-krb5", "libzephyr4-krb5",
"zephyr-clients", "zephyr-clients",
"krb5-config", "krb5-config",
"krb5-user", "krb5-user",
"debathena-kerberos-config", "debathena-kerberos-config",
"debathena-zephyr-config", "debathena-zephyr-config",
# Packages needed to build pyzephyr # Packages needed to build pyzephyr
"libzephyr-dev", "libzephyr-dev",
"comerr-dev", "comerr-dev",
"python3-dev", "python3-dev",
"python-dev", "python-dev",
"cython3", "cython3",
"cython", "cython",
] ]
package { $zmirror_packages: ensure => "installed" } package { $zmirror_packages: ensure => "installed" }
apt::source {'debathena': apt::source {'debathena':

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

@@ -3,20 +3,20 @@ class zulip_ops::zmirror_personals {
include zulip::supervisor include zulip::supervisor
$zmirror_packages = [# Packages needed to run the mirror $zmirror_packages = [# Packages needed to run the mirror
"libzephyr4-krb5", "libzephyr4-krb5",
"zephyr-clients", "zephyr-clients",
"krb5-config", "krb5-config",
"krb5-user", "krb5-user",
"debathena-kerberos-config", "debathena-kerberos-config",
"debathena-zephyr-config", "debathena-zephyr-config",
# Packages needed to build pyzephyr # Packages needed to build pyzephyr
"libzephyr-dev", "libzephyr-dev",
"comerr-dev", "comerr-dev",
"python3-dev", "python3-dev",
"python-dev", "python-dev",
"cython3", "cython3",
"cython", "cython",
] ]
package { $zmirror_packages: ensure => "installed" } package { $zmirror_packages: ensure => "installed" }
apt::source {'debathena': apt::source {'debathena':

1
tools/linter_lib/exclude.py
View File

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