mirror of
https://github.com/zulip/zulip.git
synced 2025-11-02 04:53:36 +00:00
puppet: Clean up indentation in various manifests.
These are inspired by puppet-lint, though we didn't take all of their changes, since some seem to be bugs in the tool.
This commit is contained in:
@@ -5,9 +5,9 @@ class zulip::app_frontend_base {
|
||||
include zulip::supervisor
|
||||
|
||||
$web_packages = [
|
||||
# Needed to access our database
|
||||
"postgresql-client-${zulip::base::postgres_version}",
|
||||
]
|
||||
# Needed to access our database
|
||||
"postgresql-client-${zulip::base::postgres_version}",
|
||||
]
|
||||
safepackage { $web_packages: ensure => 'installed' }
|
||||
|
||||
file { '/etc/nginx/zulip-include/app':
|
||||
|
||||
@@ -7,20 +7,21 @@ define safepackage ( $ensure = present ) {
|
||||
|
||||
class zulip::base {
|
||||
include apt
|
||||
$base_packages = [ # Accurate time is essential
|
||||
'ntp',
|
||||
# Used in scripts including install-yarn.sh
|
||||
'curl',
|
||||
'wget',
|
||||
# Used in scripts
|
||||
'netcat',
|
||||
# Nagios plugins; needed to ensure /var/lib/nagios_plugins exists
|
||||
'nagios-plugins-basic',
|
||||
# Used to read /etc/zulip/zulip.conf for `zulipconf` puppet function
|
||||
'crudini',
|
||||
# Used for tools like sponge
|
||||
'moreutils',
|
||||
]
|
||||
$base_packages = [
|
||||
# Accurate time is essential
|
||||
'ntp',
|
||||
# Used in scripts including install-yarn.sh
|
||||
'curl',
|
||||
'wget',
|
||||
# Used in scripts
|
||||
'netcat',
|
||||
# Nagios plugins; needed to ensure /var/lib/nagios_plugins exists
|
||||
'nagios-plugins-basic',
|
||||
# Used to read /etc/zulip/zulip.conf for `zulipconf` puppet function
|
||||
'crudini',
|
||||
# Used for tools like sponge
|
||||
'moreutils',
|
||||
]
|
||||
package { $base_packages: ensure => 'installed' }
|
||||
|
||||
$release_name = $::operatingsystemrelease ? {
|
||||
@@ -48,24 +49,24 @@ class zulip::base {
|
||||
}
|
||||
|
||||
$normal_queues = [
|
||||
'deferred_work',
|
||||
'digest_emails',
|
||||
'email_mirror',
|
||||
'embed_links',
|
||||
'embedded_bots',
|
||||
'error_reports',
|
||||
'feedback_messages',
|
||||
'invites',
|
||||
'missedmessage_email_senders',
|
||||
'email_senders',
|
||||
'missedmessage_emails',
|
||||
'missedmessage_mobile_notifications',
|
||||
'outgoing_webhooks',
|
||||
'signups',
|
||||
'slow_queries',
|
||||
'user_activity',
|
||||
'user_activity_interval',
|
||||
'user_presence',
|
||||
'deferred_work',
|
||||
'digest_emails',
|
||||
'email_mirror',
|
||||
'embed_links',
|
||||
'embedded_bots',
|
||||
'error_reports',
|
||||
'feedback_messages',
|
||||
'invites',
|
||||
'missedmessage_email_senders',
|
||||
'email_senders',
|
||||
'missedmessage_emails',
|
||||
'missedmessage_mobile_notifications',
|
||||
'outgoing_webhooks',
|
||||
'signups',
|
||||
'slow_queries',
|
||||
'user_activity',
|
||||
'user_activity_interval',
|
||||
'user_presence',
|
||||
]
|
||||
|
||||
group { 'zulip':
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
class zulip::nginx {
|
||||
$web_packages = [# Needed to run nginx with the modules we use
|
||||
'nginx-full',
|
||||
]
|
||||
$web_packages = [
|
||||
# Needed to run nginx with the modules we use
|
||||
'nginx-full',
|
||||
]
|
||||
package { $web_packages: ensure => 'installed' }
|
||||
|
||||
file { '/etc/nginx/zulip-include/':
|
||||
|
||||
@@ -3,12 +3,13 @@ class zulip::postgres_appdb_base {
|
||||
include zulip::postgres_common
|
||||
include zulip::supervisor
|
||||
|
||||
$appdb_packages = [# Needed to run process_fts_updates
|
||||
'python3-psycopg2', # TODO: use a virtualenv instead
|
||||
'python-psycopg2', # TODO: use a virtualenv instead
|
||||
# Needed for our full text search system
|
||||
"postgresql-${zulip::base::postgres_version}-tsearch-extras",
|
||||
]
|
||||
$appdb_packages = [
|
||||
# Needed to run process_fts_updates
|
||||
'python3-psycopg2', # TODO: use a virtualenv instead
|
||||
'python-psycopg2', # TODO: use a virtualenv instead
|
||||
# Needed for our full text search system
|
||||
"postgresql-${zulip::base::postgres_version}-tsearch-extras",
|
||||
]
|
||||
safepackage { $appdb_packages: ensure => 'installed' }
|
||||
|
||||
# We bundle a bunch of other sysctl parameters into 40-postgresql.conf
|
||||
|
||||
@@ -34,6 +34,6 @@ class zulip::redis {
|
||||
service { 'redis-server':
|
||||
ensure => running,
|
||||
subscribe => [File['/etc/redis/zulip-redis.conf'],
|
||||
Exec['redis']],
|
||||
Exec['redis']],
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@ class zulip::static_asset_compiler {
|
||||
$closure_compiler_package = 'closure-compiler'
|
||||
}
|
||||
$static_asset_compiler_packages = [
|
||||
# Needed for minify-js
|
||||
$closure_compiler_package,
|
||||
'nodejs',
|
||||
'nodejs-legacy',
|
||||
'yui-compressor',
|
||||
# Used by makemessages i18n
|
||||
'gettext',
|
||||
]
|
||||
# Needed for minify-js
|
||||
$closure_compiler_package,
|
||||
'nodejs',
|
||||
'nodejs-legacy',
|
||||
'yui-compressor',
|
||||
# Used by makemessages i18n
|
||||
'gettext',
|
||||
]
|
||||
|
||||
safepackage { $static_asset_compiler_packages: ensure => 'installed' }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user