paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +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

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::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)

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

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

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

@@ -2,11 +2,11 @@ class zulip_ops::munin {
include zulip::supervisor
$munin_packages = [# Packages needed for munin
"munin",
"autossh",
# Packages needed for munin website
'libapache2-mod-fcgid',
]
"munin",
"autossh",
# Packages needed for munin website
'libapache2-mod-fcgid',
]
package { $munin_packages: ensure => "installed" }
$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',
'/etc/nagios3/conf.d/services_nagios2.cfg',
'/etc/nagios3/conf.d/contacts_nagios2.cfg',
'/etc/nagios3/conf.d/hostgroups_nagios2.cfg',
'/etc/nagios3/conf.d/localhost_nagios2.cfg',
]:
'/etc/nagios3/conf.d/services_nagios2.cfg',
'/etc/nagios3/conf.d/contacts_nagios2.cfg',
'/etc/nagios3/conf.d/hostgroups_nagios2.cfg',
'/etc/nagios3/conf.d/localhost_nagios2.cfg',
]:
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
$internal_postgres_packages = [# dependencies for our wal-e backup system
"lzop",
"pv",
"python3-pip",
"python-pip",
# "python3-gevent", # missing on trusty
"python-gevent",
]
"lzop",
"pv",
"python3-pip",
"python-pip",
# "python3-gevent", # missing on trusty
"python-gevent",
]
package { $internal_postgres_packages: ensure => "installed" }
exec {"pip_wal-e":
@@ -28,11 +28,14 @@ class zulip_ops::postgres_common {
minute => 0,
target => "postgres",
user => "postgres",
require => [ File["/usr/local/bin/pg_backup_and_purge"],
Package["postgresql-${zulip::base::postgres_version}",
"python3-dateutil",
"python-dateutil"
] ]
require => [
File["/usr/local/bin/pg_backup_and_purge"],
Package[
"postgresql-${zulip::base::postgres_version}",
"python3-dateutil",
"python-dateutil"
]
]
}
exec { "sysctl_p":

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

@@ -3,20 +3,20 @@ 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",
# Packages needed to build pyzephyr
"libzephyr-dev",
"comerr-dev",
"python3-dev",
"python-dev",
"cython3",
"cython",
]
"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",
]
package { $zmirror_packages: ensure => "installed" }
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
$zmirror_packages = [# Packages needed to run the mirror
"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",
]
"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",
]
package { $zmirror_packages: ensure => "installed" }
apt::source {'debathena':