From 8ca76ba13fe82bff1fb4d59337741e50c40a4133 Mon Sep 17 00:00:00 2001 From: Zev Benjamin Date: Tue, 29 Oct 2013 18:53:04 -0400 Subject: [PATCH] Split our puppet configuration in two The 'zulip' module contains the general setup for any server that will run our app. The 'zulip-internal' module contains configuration that is internal to Zulip the company. (imported from commit 23c99dd889577c2917ddbf76892cf8f6cc66a13e) --- scripts/zulip-puppet-apply | 4 +- .../files/apache/ports.conf | 0 .../files/apache/sites/graphite | 0 .../files/apache/sites/graphiti | 0 .../files/apache/sites/humbug-default | 0 .../files/apache/sites/mediawiki | 0 .../files/apache/sites/nagios | 0 .../files/apache/sites/stats | 0 .../files/apache/sites/trac | 0 .../files/builder/sbuildrc | 0 .../files/builder/ubuntu-archive-keyring.gpg | Bin .../files/camo_defaults | 0 .../files/cron.d/active-user-stats | 0 .../files/cron.d/check-apns-tokens | 0 .../files/cron.d/clearsessions | 0 .../files/cron.d/email-mirror | 0 .../files/cron.d/graphite_backup | 4 + .../files/cron.d/test_zephyr_personal_mirrors | 0 .../files/cron.d/zephyr-mirror | 0 .../files/debathena.list | 0 .../files/graphite/aggregation-rules.conf | 0 .../files/graphite/carbon.conf | 0 .../files/graphite/daily_rsync_backup.sh | 0 .../files/graphite/graphite.wsgi | 0 .../files/graphite/local_settings.py | 0 .../files/graphite/setup_disks.sh | 0 .../files/graphite/storage-aggregation.conf | 0 .../files/graphite/storage-schemas.conf | 0 .../files/graphiti/settings.yml | 0 .../files/iptables/rules.zmirror | 0 .../files/mediawiki/Auth_remoteuser.php | 0 .../files/mediawiki/LocalSettings.php | 0 .../files/mediawiki/apache_config | 0 .../{zulip => zulip-internal}/files/motd.lb0 | 0 .../files/munin-plugins/humbug_send_receive | 0 .../files/munin-plugins/rabbitmq_connections | 0 .../files/munin-plugins/rabbitmq_consumers | 0 .../files/munin-plugins/rabbitmq_messages | 0 .../rabbitmq_messages_unacknowledged | 0 .../rabbitmq_messages_uncommitted | 0 .../files/munin-plugins/rabbitmq_queue_memory | 0 .../files/munin-plugins/tornado_event_queues | 0 .../files/munin/munin-node.conf | 0 .../files/munin/munin.conf | 0 .../files/munin/plugin-conf.d/munin-node.conf | 0 .../files/nagios3/cgi.cfg | 0 .../files/nagios3/commands.cfg | 0 .../files/nagios3/conf.d/contacts.cfg | 0 .../nagios3/conf.d/generic-host_nagios2.cfg | 0 .../conf.d/generic-service_nagios2.cfg | 0 .../files/nagios3/conf.d/hostgroups.cfg | 0 .../files/nagios3/conf.d/hosts.cfg | 0 .../files/nagios3/conf.d/localhost.cfg | 0 .../files/nagios3/conf.d/pagerduty_nagios.cfg | 0 .../files/nagios3/conf.d/services.cfg | 0 .../nagios3/conf.d/timeperiods_nagios2.cfg | 0 .../files/nagios3/nagios.cfg | 0 .../files/nagios3/resource.cfg | 0 .../files/nagios3/zuliprc | 0 .../files/nagios_crontab | 0 .../nagios_plugins/check_debian_packages | 0 .../files/nagios_plugins/check_email_mirror | 0 .../files/nagios_plugins/check_fts_update_log | 0 .../check_personal_zephyr_mirrors | 0 .../nagios_plugins/check_pg_replication_lag | 0 .../files/nagios_plugins/check_postgres.pl | 0 .../nagios_plugins/check_postgres_backup | 0 .../nagios_plugins/check_rabbitmq_consumers | 0 .../nagios_plugins/check_rabbitmq_queues | 0 .../nagios_plugins/check_send_receive_time | 0 .../check_user_zephyr_mirror_liveness | 0 .../files/nagios_plugins/check_zephyr_mirror | 0 .../files/nginx/sites-available/loadbalancer | 0 .../files/nginx/sites-available/zulip | 0 .../files/nginx/sites-available/zulip-staging | 0 .../files/nginx/zulip-include/loadbalancer | 0 .../files/pagerduty_nagios.pl | 0 .../postgresql/40-postgresql.conf.master | 0 .../files/postgresql/40-postgresql.conf.slave | 0 .../files/postgresql/40-postgresql.conf.trac | 0 .../files/postgresql/env-wal-e | 0 .../files/postgresql/pg_backup_and_purge.py | 0 .../files/postgresql/pg_hba.conf | 0 .../files/postgresql/postgresql.conf.master | 0 .../files/postgresql/postgresql.conf.slave | 0 .../files/postgresql/postgresql.conf.trac | 0 .../files/postgresql/process_fts_updates | 0 .../files/postgresql/recovery.conf | 0 .../files/postgresql/setup_disks.sh | 0 .../files/sparkle/mac/sparkle-changelog.html | 0 .../files/sparkle/mac/sparkle.xml | 0 .../files/sparkle/win/sparkle-changelog.html | 0 .../files/sparkle/win/sparkle.xml | 0 .../files/statsd/local.js | 0 .../files/statsd/redis.conf | 0 .../files/supervisor/conf.d/stats.conf | 0 .../files/supervisor/conf.d/zmirror.conf | 0 .../files/supervisor/conf.d/zulip_db.conf | 0 .../{zulip => zulip-internal}/files/trac.ini | 0 .../files/trac/cgi-bin/trac.cgi | 0 .../files/trac/cgi-bin/trac.fcgi | 0 .../files/trac/cgi-bin/trac.wsgi | 0 .../files/zephyr-clients.debathena | 0 .../files/zulip-ec2-configure-interfaces | 0 .../zulip-ec2-configure-interfaces_if-up.d.sh | 0 .../lib/puppet/type/apache2mod.rb | 0 .../lib/puppet/type/apache2site.rb | 0 .../lib/puppet/type/chroot.rb | 0 .../manifests/apache.pp | 8 +- .../modules/zulip-internal/manifests/base.pp | 106 ++++++++++++++++ .../manifests/bots.pp | 4 +- .../manifests/builder.pp | 8 +- .../manifests/git.pp | 4 +- .../manifests/init.pp | 4 +- .../manifests/loadbalancer.pp | 12 +- .../manifests/mediawiki.pp | 6 +- .../manifests/nagios.pp | 12 +- .../manifests/postgres-appdb.pp | 12 +- .../manifests/postgres-common.pp | 6 +- .../manifests/postgres-master.pp | 12 +- .../manifests/postgres-slave.pp | 10 +- .../manifests/prod_app_frontend.pp | 14 +-- .../manifests/staging_app_frontend.pp | 12 +- .../manifests/stats.pp | 28 ++--- .../manifests/trac.pp | 16 +-- .../manifests/zmirror.pp | 12 +- .../manifests/zmirror_personals.pp | 8 +- .../zulip/files/cron.d/graphite_backup | 4 - .../puppet/modules/zulip/manifests/base.pp | 116 ++---------------- .../puppet/modules/zulip/manifests/nginx.pp | 1 - 130 files changed, 214 insertions(+), 209 deletions(-) rename servers/puppet/modules/{zulip => zulip-internal}/files/apache/ports.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/apache/sites/graphite (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/apache/sites/graphiti (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/apache/sites/humbug-default (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/apache/sites/mediawiki (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/apache/sites/nagios (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/apache/sites/stats (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/apache/sites/trac (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/builder/sbuildrc (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/builder/ubuntu-archive-keyring.gpg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/camo_defaults (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/cron.d/active-user-stats (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/cron.d/check-apns-tokens (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/cron.d/clearsessions (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/cron.d/email-mirror (100%) create mode 100644 servers/puppet/modules/zulip-internal/files/cron.d/graphite_backup rename servers/puppet/modules/{zulip => zulip-internal}/files/cron.d/test_zephyr_personal_mirrors (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/cron.d/zephyr-mirror (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/debathena.list (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/graphite/aggregation-rules.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/graphite/carbon.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/graphite/daily_rsync_backup.sh (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/graphite/graphite.wsgi (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/graphite/local_settings.py (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/graphite/setup_disks.sh (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/graphite/storage-aggregation.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/graphite/storage-schemas.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/graphiti/settings.yml (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/iptables/rules.zmirror (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/mediawiki/Auth_remoteuser.php (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/mediawiki/LocalSettings.php (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/mediawiki/apache_config (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/motd.lb0 (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin-plugins/humbug_send_receive (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin-plugins/rabbitmq_connections (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin-plugins/rabbitmq_consumers (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin-plugins/rabbitmq_messages (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin-plugins/rabbitmq_messages_unacknowledged (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin-plugins/rabbitmq_messages_uncommitted (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin-plugins/rabbitmq_queue_memory (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin-plugins/tornado_event_queues (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin/munin-node.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin/munin.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/munin/plugin-conf.d/munin-node.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/cgi.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/commands.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/conf.d/contacts.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/conf.d/generic-host_nagios2.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/conf.d/generic-service_nagios2.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/conf.d/hostgroups.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/conf.d/hosts.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/conf.d/localhost.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/conf.d/pagerduty_nagios.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/conf.d/services.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/conf.d/timeperiods_nagios2.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/nagios.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/resource.cfg (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios3/zuliprc (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_crontab (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_debian_packages (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_email_mirror (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_fts_update_log (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_personal_zephyr_mirrors (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_pg_replication_lag (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_postgres.pl (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_postgres_backup (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_rabbitmq_consumers (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_rabbitmq_queues (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_send_receive_time (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_user_zephyr_mirror_liveness (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nagios_plugins/check_zephyr_mirror (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nginx/sites-available/loadbalancer (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nginx/sites-available/zulip (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nginx/sites-available/zulip-staging (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/nginx/zulip-include/loadbalancer (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/pagerduty_nagios.pl (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/40-postgresql.conf.master (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/40-postgresql.conf.slave (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/40-postgresql.conf.trac (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/env-wal-e (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/pg_backup_and_purge.py (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/pg_hba.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/postgresql.conf.master (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/postgresql.conf.slave (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/postgresql.conf.trac (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/process_fts_updates (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/recovery.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/postgresql/setup_disks.sh (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/sparkle/mac/sparkle-changelog.html (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/sparkle/mac/sparkle.xml (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/sparkle/win/sparkle-changelog.html (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/sparkle/win/sparkle.xml (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/statsd/local.js (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/statsd/redis.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/supervisor/conf.d/stats.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/supervisor/conf.d/zmirror.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/supervisor/conf.d/zulip_db.conf (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/trac.ini (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/trac/cgi-bin/trac.cgi (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/trac/cgi-bin/trac.fcgi (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/trac/cgi-bin/trac.wsgi (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/zephyr-clients.debathena (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/zulip-ec2-configure-interfaces (100%) rename servers/puppet/modules/{zulip => zulip-internal}/files/zulip-ec2-configure-interfaces_if-up.d.sh (100%) rename servers/puppet/modules/{zulip => zulip-internal}/lib/puppet/type/apache2mod.rb (100%) rename servers/puppet/modules/{zulip => zulip-internal}/lib/puppet/type/apache2site.rb (100%) rename servers/puppet/modules/{zulip => zulip-internal}/lib/puppet/type/chroot.rb (100%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/apache.pp (88%) create mode 100644 servers/puppet/modules/zulip-internal/manifests/base.pp rename servers/puppet/modules/{zulip => zulip-internal}/manifests/bots.pp (64%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/builder.pp (81%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/git.pp (85%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/init.pp (69%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/loadbalancer.pp (71%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/mediawiki.pp (83%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/nagios.pp (86%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/postgres-appdb.pp (67%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/postgres-common.pp (89%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/postgres-master.pp (69%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/postgres-slave.pp (61%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/prod_app_frontend.pp (75%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/staging_app_frontend.pp (70%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/stats.pp (73%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/trac.pp (73%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/zmirror.pp (76%) rename servers/puppet/modules/{zulip => zulip-internal}/manifests/zmirror_personals.pp (84%) delete mode 100644 servers/puppet/modules/zulip/files/cron.d/graphite_backup diff --git a/scripts/zulip-puppet-apply b/scripts/zulip-puppet-apply index 4a149ba83d..3913c28568 100755 --- a/scripts/zulip-puppet-apply +++ b/scripts/zulip-puppet-apply @@ -10,10 +10,10 @@ if len(extra_args) and extra_args[0] in ('-f', '--force'): force = True eatra_args = extra_args[1:] -with open('/etc/humbug-machinetype') as f: +with open('/etc/zulip/machinetype') as f: machinetype = f.readline().strip() -puppet_cmd = ["puppet", "apply", "-e", "class {'zulip': machinetype => '%s'}" % (machinetype,)] +puppet_cmd = ["puppet", "apply", "-e", "class {'zulip-internal': machinetype => '%s'}" % (machinetype,)] puppet_cmd += extra_args if force: diff --git a/servers/puppet/modules/zulip/files/apache/ports.conf b/servers/puppet/modules/zulip-internal/files/apache/ports.conf similarity index 100% rename from servers/puppet/modules/zulip/files/apache/ports.conf rename to servers/puppet/modules/zulip-internal/files/apache/ports.conf diff --git a/servers/puppet/modules/zulip/files/apache/sites/graphite b/servers/puppet/modules/zulip-internal/files/apache/sites/graphite similarity index 100% rename from servers/puppet/modules/zulip/files/apache/sites/graphite rename to servers/puppet/modules/zulip-internal/files/apache/sites/graphite diff --git a/servers/puppet/modules/zulip/files/apache/sites/graphiti b/servers/puppet/modules/zulip-internal/files/apache/sites/graphiti similarity index 100% rename from servers/puppet/modules/zulip/files/apache/sites/graphiti rename to servers/puppet/modules/zulip-internal/files/apache/sites/graphiti diff --git a/servers/puppet/modules/zulip/files/apache/sites/humbug-default b/servers/puppet/modules/zulip-internal/files/apache/sites/humbug-default similarity index 100% rename from servers/puppet/modules/zulip/files/apache/sites/humbug-default rename to servers/puppet/modules/zulip-internal/files/apache/sites/humbug-default diff --git a/servers/puppet/modules/zulip/files/apache/sites/mediawiki b/servers/puppet/modules/zulip-internal/files/apache/sites/mediawiki similarity index 100% rename from servers/puppet/modules/zulip/files/apache/sites/mediawiki rename to servers/puppet/modules/zulip-internal/files/apache/sites/mediawiki diff --git a/servers/puppet/modules/zulip/files/apache/sites/nagios b/servers/puppet/modules/zulip-internal/files/apache/sites/nagios similarity index 100% rename from servers/puppet/modules/zulip/files/apache/sites/nagios rename to servers/puppet/modules/zulip-internal/files/apache/sites/nagios diff --git a/servers/puppet/modules/zulip/files/apache/sites/stats b/servers/puppet/modules/zulip-internal/files/apache/sites/stats similarity index 100% rename from servers/puppet/modules/zulip/files/apache/sites/stats rename to servers/puppet/modules/zulip-internal/files/apache/sites/stats diff --git a/servers/puppet/modules/zulip/files/apache/sites/trac b/servers/puppet/modules/zulip-internal/files/apache/sites/trac similarity index 100% rename from servers/puppet/modules/zulip/files/apache/sites/trac rename to servers/puppet/modules/zulip-internal/files/apache/sites/trac diff --git a/servers/puppet/modules/zulip/files/builder/sbuildrc b/servers/puppet/modules/zulip-internal/files/builder/sbuildrc similarity index 100% rename from servers/puppet/modules/zulip/files/builder/sbuildrc rename to servers/puppet/modules/zulip-internal/files/builder/sbuildrc diff --git a/servers/puppet/modules/zulip/files/builder/ubuntu-archive-keyring.gpg b/servers/puppet/modules/zulip-internal/files/builder/ubuntu-archive-keyring.gpg similarity index 100% rename from servers/puppet/modules/zulip/files/builder/ubuntu-archive-keyring.gpg rename to servers/puppet/modules/zulip-internal/files/builder/ubuntu-archive-keyring.gpg diff --git a/servers/puppet/modules/zulip/files/camo_defaults b/servers/puppet/modules/zulip-internal/files/camo_defaults similarity index 100% rename from servers/puppet/modules/zulip/files/camo_defaults rename to servers/puppet/modules/zulip-internal/files/camo_defaults diff --git a/servers/puppet/modules/zulip/files/cron.d/active-user-stats b/servers/puppet/modules/zulip-internal/files/cron.d/active-user-stats similarity index 100% rename from servers/puppet/modules/zulip/files/cron.d/active-user-stats rename to servers/puppet/modules/zulip-internal/files/cron.d/active-user-stats diff --git a/servers/puppet/modules/zulip/files/cron.d/check-apns-tokens b/servers/puppet/modules/zulip-internal/files/cron.d/check-apns-tokens similarity index 100% rename from servers/puppet/modules/zulip/files/cron.d/check-apns-tokens rename to servers/puppet/modules/zulip-internal/files/cron.d/check-apns-tokens diff --git a/servers/puppet/modules/zulip/files/cron.d/clearsessions b/servers/puppet/modules/zulip-internal/files/cron.d/clearsessions similarity index 100% rename from servers/puppet/modules/zulip/files/cron.d/clearsessions rename to servers/puppet/modules/zulip-internal/files/cron.d/clearsessions diff --git a/servers/puppet/modules/zulip/files/cron.d/email-mirror b/servers/puppet/modules/zulip-internal/files/cron.d/email-mirror similarity index 100% rename from servers/puppet/modules/zulip/files/cron.d/email-mirror rename to servers/puppet/modules/zulip-internal/files/cron.d/email-mirror diff --git a/servers/puppet/modules/zulip-internal/files/cron.d/graphite_backup b/servers/puppet/modules/zulip-internal/files/cron.d/graphite_backup new file mode 100644 index 0000000000..090412adc0 --- /dev/null +++ b/servers/puppet/modules/zulip-internal/files/cron.d/graphite_backup @@ -0,0 +1,4 @@ +MAILTO=root +SHELL=/bin/bash + +0 3 * * * zulip /home/zulip/zulip/servers/puppet/modules/zulip-internal/files/graphite/daily_rsync_backup.sh diff --git a/servers/puppet/modules/zulip/files/cron.d/test_zephyr_personal_mirrors b/servers/puppet/modules/zulip-internal/files/cron.d/test_zephyr_personal_mirrors similarity index 100% rename from servers/puppet/modules/zulip/files/cron.d/test_zephyr_personal_mirrors rename to servers/puppet/modules/zulip-internal/files/cron.d/test_zephyr_personal_mirrors diff --git a/servers/puppet/modules/zulip/files/cron.d/zephyr-mirror b/servers/puppet/modules/zulip-internal/files/cron.d/zephyr-mirror similarity index 100% rename from servers/puppet/modules/zulip/files/cron.d/zephyr-mirror rename to servers/puppet/modules/zulip-internal/files/cron.d/zephyr-mirror diff --git a/servers/puppet/modules/zulip/files/debathena.list b/servers/puppet/modules/zulip-internal/files/debathena.list similarity index 100% rename from servers/puppet/modules/zulip/files/debathena.list rename to servers/puppet/modules/zulip-internal/files/debathena.list diff --git a/servers/puppet/modules/zulip/files/graphite/aggregation-rules.conf b/servers/puppet/modules/zulip-internal/files/graphite/aggregation-rules.conf similarity index 100% rename from servers/puppet/modules/zulip/files/graphite/aggregation-rules.conf rename to servers/puppet/modules/zulip-internal/files/graphite/aggregation-rules.conf diff --git a/servers/puppet/modules/zulip/files/graphite/carbon.conf b/servers/puppet/modules/zulip-internal/files/graphite/carbon.conf similarity index 100% rename from servers/puppet/modules/zulip/files/graphite/carbon.conf rename to servers/puppet/modules/zulip-internal/files/graphite/carbon.conf diff --git a/servers/puppet/modules/zulip/files/graphite/daily_rsync_backup.sh b/servers/puppet/modules/zulip-internal/files/graphite/daily_rsync_backup.sh similarity index 100% rename from servers/puppet/modules/zulip/files/graphite/daily_rsync_backup.sh rename to servers/puppet/modules/zulip-internal/files/graphite/daily_rsync_backup.sh diff --git a/servers/puppet/modules/zulip/files/graphite/graphite.wsgi b/servers/puppet/modules/zulip-internal/files/graphite/graphite.wsgi similarity index 100% rename from servers/puppet/modules/zulip/files/graphite/graphite.wsgi rename to servers/puppet/modules/zulip-internal/files/graphite/graphite.wsgi diff --git a/servers/puppet/modules/zulip/files/graphite/local_settings.py b/servers/puppet/modules/zulip-internal/files/graphite/local_settings.py similarity index 100% rename from servers/puppet/modules/zulip/files/graphite/local_settings.py rename to servers/puppet/modules/zulip-internal/files/graphite/local_settings.py diff --git a/servers/puppet/modules/zulip/files/graphite/setup_disks.sh b/servers/puppet/modules/zulip-internal/files/graphite/setup_disks.sh similarity index 100% rename from servers/puppet/modules/zulip/files/graphite/setup_disks.sh rename to servers/puppet/modules/zulip-internal/files/graphite/setup_disks.sh diff --git a/servers/puppet/modules/zulip/files/graphite/storage-aggregation.conf b/servers/puppet/modules/zulip-internal/files/graphite/storage-aggregation.conf similarity index 100% rename from servers/puppet/modules/zulip/files/graphite/storage-aggregation.conf rename to servers/puppet/modules/zulip-internal/files/graphite/storage-aggregation.conf diff --git a/servers/puppet/modules/zulip/files/graphite/storage-schemas.conf b/servers/puppet/modules/zulip-internal/files/graphite/storage-schemas.conf similarity index 100% rename from servers/puppet/modules/zulip/files/graphite/storage-schemas.conf rename to servers/puppet/modules/zulip-internal/files/graphite/storage-schemas.conf diff --git a/servers/puppet/modules/zulip/files/graphiti/settings.yml b/servers/puppet/modules/zulip-internal/files/graphiti/settings.yml similarity index 100% rename from servers/puppet/modules/zulip/files/graphiti/settings.yml rename to servers/puppet/modules/zulip-internal/files/graphiti/settings.yml diff --git a/servers/puppet/modules/zulip/files/iptables/rules.zmirror b/servers/puppet/modules/zulip-internal/files/iptables/rules.zmirror similarity index 100% rename from servers/puppet/modules/zulip/files/iptables/rules.zmirror rename to servers/puppet/modules/zulip-internal/files/iptables/rules.zmirror diff --git a/servers/puppet/modules/zulip/files/mediawiki/Auth_remoteuser.php b/servers/puppet/modules/zulip-internal/files/mediawiki/Auth_remoteuser.php similarity index 100% rename from servers/puppet/modules/zulip/files/mediawiki/Auth_remoteuser.php rename to servers/puppet/modules/zulip-internal/files/mediawiki/Auth_remoteuser.php diff --git a/servers/puppet/modules/zulip/files/mediawiki/LocalSettings.php b/servers/puppet/modules/zulip-internal/files/mediawiki/LocalSettings.php similarity index 100% rename from servers/puppet/modules/zulip/files/mediawiki/LocalSettings.php rename to servers/puppet/modules/zulip-internal/files/mediawiki/LocalSettings.php diff --git a/servers/puppet/modules/zulip/files/mediawiki/apache_config b/servers/puppet/modules/zulip-internal/files/mediawiki/apache_config similarity index 100% rename from servers/puppet/modules/zulip/files/mediawiki/apache_config rename to servers/puppet/modules/zulip-internal/files/mediawiki/apache_config diff --git a/servers/puppet/modules/zulip/files/motd.lb0 b/servers/puppet/modules/zulip-internal/files/motd.lb0 similarity index 100% rename from servers/puppet/modules/zulip/files/motd.lb0 rename to servers/puppet/modules/zulip-internal/files/motd.lb0 diff --git a/servers/puppet/modules/zulip/files/munin-plugins/humbug_send_receive b/servers/puppet/modules/zulip-internal/files/munin-plugins/humbug_send_receive similarity index 100% rename from servers/puppet/modules/zulip/files/munin-plugins/humbug_send_receive rename to servers/puppet/modules/zulip-internal/files/munin-plugins/humbug_send_receive diff --git a/servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_connections b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_connections similarity index 100% rename from servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_connections rename to servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_connections diff --git a/servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_consumers b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_consumers similarity index 100% rename from servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_consumers rename to servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_consumers diff --git a/servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_messages b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages similarity index 100% rename from servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_messages rename to servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages diff --git a/servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_messages_unacknowledged b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages_unacknowledged similarity index 100% rename from servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_messages_unacknowledged rename to servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages_unacknowledged diff --git a/servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_messages_uncommitted b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages_uncommitted similarity index 100% rename from servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_messages_uncommitted rename to servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages_uncommitted diff --git a/servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_queue_memory b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_queue_memory similarity index 100% rename from servers/puppet/modules/zulip/files/munin-plugins/rabbitmq_queue_memory rename to servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_queue_memory diff --git a/servers/puppet/modules/zulip/files/munin-plugins/tornado_event_queues b/servers/puppet/modules/zulip-internal/files/munin-plugins/tornado_event_queues similarity index 100% rename from servers/puppet/modules/zulip/files/munin-plugins/tornado_event_queues rename to servers/puppet/modules/zulip-internal/files/munin-plugins/tornado_event_queues diff --git a/servers/puppet/modules/zulip/files/munin/munin-node.conf b/servers/puppet/modules/zulip-internal/files/munin/munin-node.conf similarity index 100% rename from servers/puppet/modules/zulip/files/munin/munin-node.conf rename to servers/puppet/modules/zulip-internal/files/munin/munin-node.conf diff --git a/servers/puppet/modules/zulip/files/munin/munin.conf b/servers/puppet/modules/zulip-internal/files/munin/munin.conf similarity index 100% rename from servers/puppet/modules/zulip/files/munin/munin.conf rename to servers/puppet/modules/zulip-internal/files/munin/munin.conf diff --git a/servers/puppet/modules/zulip/files/munin/plugin-conf.d/munin-node.conf b/servers/puppet/modules/zulip-internal/files/munin/plugin-conf.d/munin-node.conf similarity index 100% rename from servers/puppet/modules/zulip/files/munin/plugin-conf.d/munin-node.conf rename to servers/puppet/modules/zulip-internal/files/munin/plugin-conf.d/munin-node.conf diff --git a/servers/puppet/modules/zulip/files/nagios3/cgi.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/cgi.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/cgi.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/cgi.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/commands.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/commands.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/commands.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/commands.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/contacts.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/conf.d/contacts.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/conf.d/contacts.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/conf.d/contacts.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/generic-host_nagios2.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/conf.d/generic-host_nagios2.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/conf.d/generic-host_nagios2.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/conf.d/generic-host_nagios2.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/generic-service_nagios2.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/conf.d/generic-service_nagios2.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/conf.d/generic-service_nagios2.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/conf.d/generic-service_nagios2.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/hostgroups.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/conf.d/hostgroups.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/conf.d/hostgroups.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/conf.d/hostgroups.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/hosts.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/conf.d/hosts.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/conf.d/hosts.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/conf.d/hosts.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/localhost.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/conf.d/localhost.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/conf.d/localhost.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/conf.d/localhost.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/pagerduty_nagios.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/conf.d/pagerduty_nagios.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/conf.d/pagerduty_nagios.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/conf.d/pagerduty_nagios.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/conf.d/services.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/conf.d/services.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/timeperiods_nagios2.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/conf.d/timeperiods_nagios2.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/conf.d/timeperiods_nagios2.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/conf.d/timeperiods_nagios2.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/nagios.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/nagios.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/nagios.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/nagios.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/resource.cfg b/servers/puppet/modules/zulip-internal/files/nagios3/resource.cfg similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/resource.cfg rename to servers/puppet/modules/zulip-internal/files/nagios3/resource.cfg diff --git a/servers/puppet/modules/zulip/files/nagios3/zuliprc b/servers/puppet/modules/zulip-internal/files/nagios3/zuliprc similarity index 100% rename from servers/puppet/modules/zulip/files/nagios3/zuliprc rename to servers/puppet/modules/zulip-internal/files/nagios3/zuliprc diff --git a/servers/puppet/modules/zulip/files/nagios_crontab b/servers/puppet/modules/zulip-internal/files/nagios_crontab similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_crontab rename to servers/puppet/modules/zulip-internal/files/nagios_crontab diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_debian_packages b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_debian_packages similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_debian_packages rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_debian_packages diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_email_mirror b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_email_mirror similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_email_mirror rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_email_mirror diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_fts_update_log b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_fts_update_log similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_fts_update_log rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_fts_update_log diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_personal_zephyr_mirrors b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_personal_zephyr_mirrors similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_personal_zephyr_mirrors rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_personal_zephyr_mirrors diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_pg_replication_lag similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_pg_replication_lag diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_postgres.pl b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_postgres.pl similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_postgres.pl rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_postgres.pl diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_postgres_backup b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_postgres_backup similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_postgres_backup rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_postgres_backup diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_consumers b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_rabbitmq_consumers similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_consumers rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_rabbitmq_consumers diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_queues b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_rabbitmq_queues similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_queues rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_rabbitmq_queues diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_send_receive_time b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_send_receive_time similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_send_receive_time rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_send_receive_time diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_user_zephyr_mirror_liveness b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_user_zephyr_mirror_liveness similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_user_zephyr_mirror_liveness rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_user_zephyr_mirror_liveness diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_zephyr_mirror b/servers/puppet/modules/zulip-internal/files/nagios_plugins/check_zephyr_mirror similarity index 100% rename from servers/puppet/modules/zulip/files/nagios_plugins/check_zephyr_mirror rename to servers/puppet/modules/zulip-internal/files/nagios_plugins/check_zephyr_mirror diff --git a/servers/puppet/modules/zulip/files/nginx/sites-available/loadbalancer b/servers/puppet/modules/zulip-internal/files/nginx/sites-available/loadbalancer similarity index 100% rename from servers/puppet/modules/zulip/files/nginx/sites-available/loadbalancer rename to servers/puppet/modules/zulip-internal/files/nginx/sites-available/loadbalancer diff --git a/servers/puppet/modules/zulip/files/nginx/sites-available/zulip b/servers/puppet/modules/zulip-internal/files/nginx/sites-available/zulip similarity index 100% rename from servers/puppet/modules/zulip/files/nginx/sites-available/zulip rename to servers/puppet/modules/zulip-internal/files/nginx/sites-available/zulip diff --git a/servers/puppet/modules/zulip/files/nginx/sites-available/zulip-staging b/servers/puppet/modules/zulip-internal/files/nginx/sites-available/zulip-staging similarity index 100% rename from servers/puppet/modules/zulip/files/nginx/sites-available/zulip-staging rename to servers/puppet/modules/zulip-internal/files/nginx/sites-available/zulip-staging diff --git a/servers/puppet/modules/zulip/files/nginx/zulip-include/loadbalancer b/servers/puppet/modules/zulip-internal/files/nginx/zulip-include/loadbalancer similarity index 100% rename from servers/puppet/modules/zulip/files/nginx/zulip-include/loadbalancer rename to servers/puppet/modules/zulip-internal/files/nginx/zulip-include/loadbalancer diff --git a/servers/puppet/modules/zulip/files/pagerduty_nagios.pl b/servers/puppet/modules/zulip-internal/files/pagerduty_nagios.pl similarity index 100% rename from servers/puppet/modules/zulip/files/pagerduty_nagios.pl rename to servers/puppet/modules/zulip-internal/files/pagerduty_nagios.pl diff --git a/servers/puppet/modules/zulip/files/postgresql/40-postgresql.conf.master b/servers/puppet/modules/zulip-internal/files/postgresql/40-postgresql.conf.master similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/40-postgresql.conf.master rename to servers/puppet/modules/zulip-internal/files/postgresql/40-postgresql.conf.master diff --git a/servers/puppet/modules/zulip/files/postgresql/40-postgresql.conf.slave b/servers/puppet/modules/zulip-internal/files/postgresql/40-postgresql.conf.slave similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/40-postgresql.conf.slave rename to servers/puppet/modules/zulip-internal/files/postgresql/40-postgresql.conf.slave diff --git a/servers/puppet/modules/zulip/files/postgresql/40-postgresql.conf.trac b/servers/puppet/modules/zulip-internal/files/postgresql/40-postgresql.conf.trac similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/40-postgresql.conf.trac rename to servers/puppet/modules/zulip-internal/files/postgresql/40-postgresql.conf.trac diff --git a/servers/puppet/modules/zulip/files/postgresql/env-wal-e b/servers/puppet/modules/zulip-internal/files/postgresql/env-wal-e similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/env-wal-e rename to servers/puppet/modules/zulip-internal/files/postgresql/env-wal-e diff --git a/servers/puppet/modules/zulip/files/postgresql/pg_backup_and_purge.py b/servers/puppet/modules/zulip-internal/files/postgresql/pg_backup_and_purge.py similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/pg_backup_and_purge.py rename to servers/puppet/modules/zulip-internal/files/postgresql/pg_backup_and_purge.py diff --git a/servers/puppet/modules/zulip/files/postgresql/pg_hba.conf b/servers/puppet/modules/zulip-internal/files/postgresql/pg_hba.conf similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/pg_hba.conf rename to servers/puppet/modules/zulip-internal/files/postgresql/pg_hba.conf diff --git a/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.master b/servers/puppet/modules/zulip-internal/files/postgresql/postgresql.conf.master similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/postgresql.conf.master rename to servers/puppet/modules/zulip-internal/files/postgresql/postgresql.conf.master diff --git a/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.slave b/servers/puppet/modules/zulip-internal/files/postgresql/postgresql.conf.slave similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/postgresql.conf.slave rename to servers/puppet/modules/zulip-internal/files/postgresql/postgresql.conf.slave diff --git a/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.trac b/servers/puppet/modules/zulip-internal/files/postgresql/postgresql.conf.trac similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/postgresql.conf.trac rename to servers/puppet/modules/zulip-internal/files/postgresql/postgresql.conf.trac diff --git a/servers/puppet/modules/zulip/files/postgresql/process_fts_updates b/servers/puppet/modules/zulip-internal/files/postgresql/process_fts_updates similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/process_fts_updates rename to servers/puppet/modules/zulip-internal/files/postgresql/process_fts_updates diff --git a/servers/puppet/modules/zulip/files/postgresql/recovery.conf b/servers/puppet/modules/zulip-internal/files/postgresql/recovery.conf similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/recovery.conf rename to servers/puppet/modules/zulip-internal/files/postgresql/recovery.conf diff --git a/servers/puppet/modules/zulip/files/postgresql/setup_disks.sh b/servers/puppet/modules/zulip-internal/files/postgresql/setup_disks.sh similarity index 100% rename from servers/puppet/modules/zulip/files/postgresql/setup_disks.sh rename to servers/puppet/modules/zulip-internal/files/postgresql/setup_disks.sh diff --git a/servers/puppet/modules/zulip/files/sparkle/mac/sparkle-changelog.html b/servers/puppet/modules/zulip-internal/files/sparkle/mac/sparkle-changelog.html similarity index 100% rename from servers/puppet/modules/zulip/files/sparkle/mac/sparkle-changelog.html rename to servers/puppet/modules/zulip-internal/files/sparkle/mac/sparkle-changelog.html diff --git a/servers/puppet/modules/zulip/files/sparkle/mac/sparkle.xml b/servers/puppet/modules/zulip-internal/files/sparkle/mac/sparkle.xml similarity index 100% rename from servers/puppet/modules/zulip/files/sparkle/mac/sparkle.xml rename to servers/puppet/modules/zulip-internal/files/sparkle/mac/sparkle.xml diff --git a/servers/puppet/modules/zulip/files/sparkle/win/sparkle-changelog.html b/servers/puppet/modules/zulip-internal/files/sparkle/win/sparkle-changelog.html similarity index 100% rename from servers/puppet/modules/zulip/files/sparkle/win/sparkle-changelog.html rename to servers/puppet/modules/zulip-internal/files/sparkle/win/sparkle-changelog.html diff --git a/servers/puppet/modules/zulip/files/sparkle/win/sparkle.xml b/servers/puppet/modules/zulip-internal/files/sparkle/win/sparkle.xml similarity index 100% rename from servers/puppet/modules/zulip/files/sparkle/win/sparkle.xml rename to servers/puppet/modules/zulip-internal/files/sparkle/win/sparkle.xml diff --git a/servers/puppet/modules/zulip/files/statsd/local.js b/servers/puppet/modules/zulip-internal/files/statsd/local.js similarity index 100% rename from servers/puppet/modules/zulip/files/statsd/local.js rename to servers/puppet/modules/zulip-internal/files/statsd/local.js diff --git a/servers/puppet/modules/zulip/files/statsd/redis.conf b/servers/puppet/modules/zulip-internal/files/statsd/redis.conf similarity index 100% rename from servers/puppet/modules/zulip/files/statsd/redis.conf rename to servers/puppet/modules/zulip-internal/files/statsd/redis.conf diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf b/servers/puppet/modules/zulip-internal/files/supervisor/conf.d/stats.conf similarity index 100% rename from servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf rename to servers/puppet/modules/zulip-internal/files/supervisor/conf.d/stats.conf diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf b/servers/puppet/modules/zulip-internal/files/supervisor/conf.d/zmirror.conf similarity index 100% rename from servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf rename to servers/puppet/modules/zulip-internal/files/supervisor/conf.d/zmirror.conf diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip_db.conf b/servers/puppet/modules/zulip-internal/files/supervisor/conf.d/zulip_db.conf similarity index 100% rename from servers/puppet/modules/zulip/files/supervisor/conf.d/zulip_db.conf rename to servers/puppet/modules/zulip-internal/files/supervisor/conf.d/zulip_db.conf diff --git a/servers/puppet/modules/zulip/files/trac.ini b/servers/puppet/modules/zulip-internal/files/trac.ini similarity index 100% rename from servers/puppet/modules/zulip/files/trac.ini rename to servers/puppet/modules/zulip-internal/files/trac.ini diff --git a/servers/puppet/modules/zulip/files/trac/cgi-bin/trac.cgi b/servers/puppet/modules/zulip-internal/files/trac/cgi-bin/trac.cgi similarity index 100% rename from servers/puppet/modules/zulip/files/trac/cgi-bin/trac.cgi rename to servers/puppet/modules/zulip-internal/files/trac/cgi-bin/trac.cgi diff --git a/servers/puppet/modules/zulip/files/trac/cgi-bin/trac.fcgi b/servers/puppet/modules/zulip-internal/files/trac/cgi-bin/trac.fcgi similarity index 100% rename from servers/puppet/modules/zulip/files/trac/cgi-bin/trac.fcgi rename to servers/puppet/modules/zulip-internal/files/trac/cgi-bin/trac.fcgi diff --git a/servers/puppet/modules/zulip/files/trac/cgi-bin/trac.wsgi b/servers/puppet/modules/zulip-internal/files/trac/cgi-bin/trac.wsgi similarity index 100% rename from servers/puppet/modules/zulip/files/trac/cgi-bin/trac.wsgi rename to servers/puppet/modules/zulip-internal/files/trac/cgi-bin/trac.wsgi diff --git a/servers/puppet/modules/zulip/files/zephyr-clients.debathena b/servers/puppet/modules/zulip-internal/files/zephyr-clients.debathena similarity index 100% rename from servers/puppet/modules/zulip/files/zephyr-clients.debathena rename to servers/puppet/modules/zulip-internal/files/zephyr-clients.debathena diff --git a/servers/puppet/modules/zulip/files/zulip-ec2-configure-interfaces b/servers/puppet/modules/zulip-internal/files/zulip-ec2-configure-interfaces similarity index 100% rename from servers/puppet/modules/zulip/files/zulip-ec2-configure-interfaces rename to servers/puppet/modules/zulip-internal/files/zulip-ec2-configure-interfaces diff --git a/servers/puppet/modules/zulip/files/zulip-ec2-configure-interfaces_if-up.d.sh b/servers/puppet/modules/zulip-internal/files/zulip-ec2-configure-interfaces_if-up.d.sh similarity index 100% rename from servers/puppet/modules/zulip/files/zulip-ec2-configure-interfaces_if-up.d.sh rename to servers/puppet/modules/zulip-internal/files/zulip-ec2-configure-interfaces_if-up.d.sh diff --git a/servers/puppet/modules/zulip/lib/puppet/type/apache2mod.rb b/servers/puppet/modules/zulip-internal/lib/puppet/type/apache2mod.rb similarity index 100% rename from servers/puppet/modules/zulip/lib/puppet/type/apache2mod.rb rename to servers/puppet/modules/zulip-internal/lib/puppet/type/apache2mod.rb diff --git a/servers/puppet/modules/zulip/lib/puppet/type/apache2site.rb b/servers/puppet/modules/zulip-internal/lib/puppet/type/apache2site.rb similarity index 100% rename from servers/puppet/modules/zulip/lib/puppet/type/apache2site.rb rename to servers/puppet/modules/zulip-internal/lib/puppet/type/apache2site.rb diff --git a/servers/puppet/modules/zulip/lib/puppet/type/chroot.rb b/servers/puppet/modules/zulip-internal/lib/puppet/type/chroot.rb similarity index 100% rename from servers/puppet/modules/zulip/lib/puppet/type/chroot.rb rename to servers/puppet/modules/zulip-internal/lib/puppet/type/chroot.rb diff --git a/servers/puppet/modules/zulip/manifests/apache.pp b/servers/puppet/modules/zulip-internal/manifests/apache.pp similarity index 88% rename from servers/puppet/modules/zulip/manifests/apache.pp rename to servers/puppet/modules/zulip-internal/manifests/apache.pp index 704ce20d24..b7fce8d046 100644 --- a/servers/puppet/modules/zulip/manifests/apache.pp +++ b/servers/puppet/modules/zulip-internal/manifests/apache.pp @@ -1,4 +1,4 @@ -class zulip::apache { +class zulip-internal::apache { $apache_packages = [ "apache2", "libapache2-mod-wsgi", ] package { $apache_packages: ensure => "installed" } @@ -21,7 +21,7 @@ class zulip::apache { owner => "www-data", group => "www-data", mode => 600, - source => "puppet:///modules/zulip/apache/users", + source => "puppet:///modules/zulip-internal/apache/users", } file { "/etc/apache2/certs/": @@ -56,7 +56,7 @@ class zulip::apache { owner => "root", group => "root", mode => 640, - source => "puppet:///modules/zulip/apache/ports.conf", + source => "puppet:///modules/zulip-internal/apache/ports.conf", } file { "/etc/apache2/sites-available/": @@ -65,7 +65,7 @@ class zulip::apache { owner => "root", group => "root", mode => 640, - source => "puppet:///modules/zulip/apache/sites/", + source => "puppet:///modules/zulip-internal/apache/sites/", } apache2site { 'humbug-default': diff --git a/servers/puppet/modules/zulip-internal/manifests/base.pp b/servers/puppet/modules/zulip-internal/manifests/base.pp new file mode 100644 index 0000000000..9109188d82 --- /dev/null +++ b/servers/puppet/modules/zulip-internal/manifests/base.pp @@ -0,0 +1,106 @@ +class zulip-internal::base { + class { 'zulip::base': } + + $org_base_packages = [ "nagios-plugins-basic", "munin-node", "munin-plugins-extra" ] + package { $org_base_packages: ensure => "installed" } + + file { '/home/zulip/.ssh/authorized_keys': + ensure => file, + require => File['/home/zulip/.ssh'], + mode => 600, + owner => "zulip", + group => "zulip", + source => 'puppet:///modules/zulip-internal/authorized_keys', + } + file { '/home/zulip/.ssh': + ensure => directory, + require => User['zulip'], + owner => "zulip", + group => "zulip", + mode => 600, + } + + file { '/root/.ssh/authorized_keys': + ensure => file, + mode => 600, + owner => "root", + group => "root", + source => 'puppet:///modules/zulip-internal/root_authorized_keys', + } + + # This is just an empty file. It's used by the app to test if it's running + # in production. + file { '/etc/zulip/server': + ensure => file, + mode => 644, + content => '', + } + + file { '/usr/local/sbin/zulip-ec2-configure-interfaces': + ensure => file, + mode => 755, + source => 'puppet:///modules/zulip-internal/zulip-ec2-configure-interfaces', + } + + file { '/etc/network/if-up.d/zulip-ec2-configure-interfaces_if-up.d.sh': + ensure => file, + mode => 755, + source => 'puppet:///modules/zulip-internal/zulip-ec2-configure-interfaces_if-up.d.sh', + } + + group { 'nagios': + ensure => present, + gid => '1050', + } + user { 'nagios': + ensure => present, + uid => '1050', + gid => '1050', + shell => '/bin/bash', + home => '/var/lib/nagios', + managehome => true, + } + file { '/var/lib/nagios/': + ensure => directory, + require => User['nagios'], + owner => "nagios", + group => "nagios", + mode => 600, + } + file { '/var/lib/nagios_state/': + ensure => directory, + require => User['nagios'], + owner => "nagios", + group => "nagios", + mode => 777, + } + file { '/var/lib/nagios/.ssh': + ensure => directory, + require => File['/var/lib/nagios/'], + owner => "nagios", + group => "nagios", + mode => 600, + } + file { '/var/lib/nagios/.ssh/authorized_keys': + ensure => file, + require => File['/var/lib/nagios/.ssh'], + mode => 600, + owner => "nagios", + group => "nagios", + source => 'puppet:///modules/zulip-internal/nagios_authorized_keys', + } + file { '/home/nagios': + ensure => absent, + force => true, + recurse => true, + } + file { "/usr/lib/nagios/plugins/": + require => Package[nagios-plugins-basic], + recurse => true, + purge => false, + owner => "root", + group => "root", + mode => 755, + source => "puppet:///modules/zulip-internal/nagios_plugins/", + } +} diff --git a/servers/puppet/modules/zulip/manifests/bots.pp b/servers/puppet/modules/zulip-internal/manifests/bots.pp similarity index 64% rename from servers/puppet/modules/zulip/manifests/bots.pp rename to servers/puppet/modules/zulip-internal/manifests/bots.pp index f378168c54..259dcb66ca 100644 --- a/servers/puppet/modules/zulip/manifests/bots.pp +++ b/servers/puppet/modules/zulip-internal/manifests/bots.pp @@ -1,5 +1,5 @@ -class zulip::bots { - class { 'zulip::base': } +class zulip-internal::bots { + class { 'zulip-internal::base': } class { 'zulip::supervisor': } file { '/etc/supervisor/conf.d/feedback-bot.conf': diff --git a/servers/puppet/modules/zulip/manifests/builder.pp b/servers/puppet/modules/zulip-internal/manifests/builder.pp similarity index 81% rename from servers/puppet/modules/zulip/manifests/builder.pp rename to servers/puppet/modules/zulip-internal/manifests/builder.pp index c73c91ca85..56209634a6 100644 --- a/servers/puppet/modules/zulip/manifests/builder.pp +++ b/servers/puppet/modules/zulip-internal/manifests/builder.pp @@ -1,5 +1,5 @@ -class zulip::builder { - class { 'zulip::base': } +class zulip-internal::builder { + class { 'zulip-internal::base': } $buildd_packages = [ "apt-spy", @@ -16,13 +16,13 @@ class zulip::builder { owner => "zulip", group => "zulip", mode => 644, - source => "puppet:///modules/zulip/builder/sbuildrc", + source => "puppet:///modules/zulip-internal/builder/sbuildrc", } file { "/usr/share/keyrings/ubuntu-archive-keyring.gpg": ensure => file, mode => 644, - source => "puppet:///modules/zulip/builder/ubuntu-archive-keyring.gpg", + source => "puppet:///modules/zulip-internal/builder/ubuntu-archive-keyring.gpg", } diff --git a/servers/puppet/modules/zulip/manifests/git.pp b/servers/puppet/modules/zulip-internal/manifests/git.pp similarity index 85% rename from servers/puppet/modules/zulip/manifests/git.pp rename to servers/puppet/modules/zulip-internal/manifests/git.pp index 694f94f604..81e4419873 100644 --- a/servers/puppet/modules/zulip/manifests/git.pp +++ b/servers/puppet/modules/zulip-internal/manifests/git.pp @@ -1,5 +1,5 @@ -class zulip::git { - class { 'zulip::base': } +class zulip-internal::git { + class { 'zulip-internal::base': } $git_packages = [ ] package { $git_packages: ensure => "installed" } diff --git a/servers/puppet/modules/zulip/manifests/init.pp b/servers/puppet/modules/zulip-internal/manifests/init.pp similarity index 69% rename from servers/puppet/modules/zulip/manifests/init.pp rename to servers/puppet/modules/zulip-internal/manifests/init.pp index b5426467b4..efe130e4c2 100644 --- a/servers/puppet/modules/zulip/manifests/init.pp +++ b/servers/puppet/modules/zulip-internal/manifests/init.pp @@ -1,5 +1,5 @@ -class zulip ($machinetype) { - class { "zulip::$machinetype": } +class zulip-internal ($machinetype) { + class { "zulip-internal::$machinetype": } file { '/etc/zulip/machinetype': ensure => file, diff --git a/servers/puppet/modules/zulip/manifests/loadbalancer.pp b/servers/puppet/modules/zulip-internal/manifests/loadbalancer.pp similarity index 71% rename from servers/puppet/modules/zulip/manifests/loadbalancer.pp rename to servers/puppet/modules/zulip-internal/manifests/loadbalancer.pp index aae99b7a86..fdc989a1e6 100644 --- a/servers/puppet/modules/zulip/manifests/loadbalancer.pp +++ b/servers/puppet/modules/zulip-internal/manifests/loadbalancer.pp @@ -1,5 +1,5 @@ -class zulip::loadbalancer { - class { 'zulip::base': } +class zulip-internal::loadbalancer { + class { 'zulip-internal::base': } class { 'zulip::nginx': } file { "/etc/nginx/zulip-include/": @@ -8,7 +8,7 @@ class zulip::loadbalancer { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/nginx/zulip-include/", + source => "puppet:///modules/zulip-orig/nginx/zulip-include/", notify => Service["nginx"], } @@ -18,7 +18,7 @@ class zulip::loadbalancer { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/nginx/sites-available/loadbalancer", + source => "puppet:///modules/zulip-internal/nginx/sites-available/loadbalancer", } file { "/etc/motd": @@ -26,7 +26,7 @@ class zulip::loadbalancer { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/motd.lb0", + source => "puppet:///modules/zulip-internal/motd.lb0", } file { '/etc/nginx/sites-enabled/loadbalancer': @@ -44,6 +44,6 @@ class zulip::loadbalancer { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/camo_defaults", + source => "puppet:///modules/zulip-internal/camo_defaults", } } diff --git a/servers/puppet/modules/zulip/manifests/mediawiki.pp b/servers/puppet/modules/zulip-internal/manifests/mediawiki.pp similarity index 83% rename from servers/puppet/modules/zulip/manifests/mediawiki.pp rename to servers/puppet/modules/zulip-internal/manifests/mediawiki.pp index 92fc721473..6b5cc78c6d 100644 --- a/servers/puppet/modules/zulip/manifests/mediawiki.pp +++ b/servers/puppet/modules/zulip-internal/manifests/mediawiki.pp @@ -1,4 +1,4 @@ -class zulip::mediawiki { +class zulip-internal::mediawiki { class { 'zulip::postgres-common': } @@ -17,7 +17,7 @@ class zulip::mediawiki { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/mediawiki/LocalSettings.php", + source => "puppet:///modules/zulip-internal/mediawiki/LocalSettings.php", } file { '/usr/local/share/mediawiki/extensions/Auth_remoteuser.php': @@ -25,7 +25,7 @@ class zulip::mediawiki { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/mediawiki/Auth_remoteuser.php", + source => "puppet:///modules/zulip-internal/mediawiki/Auth_remoteuser.php", } file { '/etc/mediawiki-extensions/extensions-available/Auth_remoteuser.php': diff --git a/servers/puppet/modules/zulip/manifests/nagios.pp b/servers/puppet/modules/zulip-internal/manifests/nagios.pp similarity index 86% rename from servers/puppet/modules/zulip/manifests/nagios.pp rename to servers/puppet/modules/zulip-internal/manifests/nagios.pp index 90a4adbf2f..c8e7c91e7c 100644 --- a/servers/puppet/modules/zulip/manifests/nagios.pp +++ b/servers/puppet/modules/zulip-internal/manifests/nagios.pp @@ -1,6 +1,6 @@ -class zulip::nagios { - class { 'zulip::base': } - class { 'zulip::apache': } +class zulip-internal::nagios { + class { 'zulip-internal::base': } + class { 'zulip-internal::apache': } $nagios_packages = [ "nagios3", "munin", "autossh" ] package { $nagios_packages: ensure => "installed" } @@ -19,7 +19,7 @@ class zulip::nagios { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/nagios3/", + source => "puppet:///modules/zulip-internal/nagios3/", notify => Service["nagios3"], } @@ -32,7 +32,7 @@ class zulip::nagios { mode => 755, owner => "root", group => "root", - source => 'puppet:///modules/zulip/pagerduty_nagios.pl', + source => 'puppet:///modules/zulip-internal/pagerduty_nagios.pl', } file { '/etc/nagios3/conf.d/zulip_nagios.cfg': @@ -68,7 +68,7 @@ class zulip::nagios { owner => "nagios", group => "crontab", mode => 600, - source => "puppet:///modules/zulip/nagios_crontab", + source => "puppet:///modules/zulip-internal/nagios_crontab", } # TODO: Install our API diff --git a/servers/puppet/modules/zulip/manifests/postgres-appdb.pp b/servers/puppet/modules/zulip-internal/manifests/postgres-appdb.pp similarity index 67% rename from servers/puppet/modules/zulip/manifests/postgres-appdb.pp rename to servers/puppet/modules/zulip-internal/manifests/postgres-appdb.pp index 0254fa552a..cc8b744588 100644 --- a/servers/puppet/modules/zulip/manifests/postgres-appdb.pp +++ b/servers/puppet/modules/zulip-internal/manifests/postgres-appdb.pp @@ -1,5 +1,5 @@ -class zulip::postgres-appdb { - class { 'zulip::postgres-common': } +class zulip-internal::postgres-appdb { + class { 'zulip-internal::postgres-common': } class { 'zulip::supervisor': } $appdb_packages = [ "python-psycopg2",] @@ -10,7 +10,7 @@ class zulip::postgres-appdb { owner => "root", group => "root", mode => 755, - source => "puppet:///modules/zulip/postgresql/process_fts_updates", + source => "puppet:///modules/zulip-internal/postgresql/process_fts_updates", } file { "/etc/supervisor/conf.d/zulip_db.conf": @@ -19,7 +19,7 @@ class zulip::postgres-appdb { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/supervisor/conf.d/zulip_db.conf", + source => "puppet:///modules/zulip-internal/supervisor/conf.d/zulip_db.conf", notify => Service[supervisor], } @@ -29,7 +29,7 @@ class zulip::postgres-appdb { owner => "postgres", group => "postgres", mode => 640, - source => "puppet:///modules/zulip/postgresql/pg_hba.conf", + source => "puppet:///modules/zulip-internal/postgresql/pg_hba.conf", } file { "/usr/share/postgresql/9.1/tsearch_data/zulip_english.stop": @@ -38,7 +38,7 @@ class zulip::postgres-appdb { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/postgresql/zulip_english.stop", + source => "puppet:///modules/zulip-internal/postgresql/zulip_english.stop", } } diff --git a/servers/puppet/modules/zulip/manifests/postgres-common.pp b/servers/puppet/modules/zulip-internal/manifests/postgres-common.pp similarity index 89% rename from servers/puppet/modules/zulip/manifests/postgres-common.pp rename to servers/puppet/modules/zulip-internal/manifests/postgres-common.pp index 54803aee53..06de18f77e 100644 --- a/servers/puppet/modules/zulip/manifests/postgres-common.pp +++ b/servers/puppet/modules/zulip-internal/manifests/postgres-common.pp @@ -1,4 +1,4 @@ -class zulip::postgres-common { +class zulip-internal::postgres-common { $postgres_packages = [ "postgresql-9.1", "pgtune", "python-argparse", "python-gevent", @@ -17,7 +17,7 @@ class zulip::postgres-common { owner => "root", group => "postgres", mode => 750, - source => "puppet:///modules/zulip/postgresql/env-wal-e", + source => "puppet:///modules/zulip-internal/postgresql/env-wal-e", } file { "/usr/local/bin/pg_backup_and_purge.py": @@ -25,7 +25,7 @@ class zulip::postgres-common { owner => "root", group => "postgres", mode => 754, - source => "puppet:///modules/zulip/postgresql/pg_backup_and_purge.py", + source => "puppet:///modules/zulip-internal/postgresql/pg_backup_and_purge.py", require => File["/usr/local/bin/env-wal-e"], } diff --git a/servers/puppet/modules/zulip/manifests/postgres-master.pp b/servers/puppet/modules/zulip-internal/manifests/postgres-master.pp similarity index 69% rename from servers/puppet/modules/zulip/manifests/postgres-master.pp rename to servers/puppet/modules/zulip-internal/manifests/postgres-master.pp index b7e11156b2..62c35ddafa 100644 --- a/servers/puppet/modules/zulip/manifests/postgres-master.pp +++ b/servers/puppet/modules/zulip-internal/manifests/postgres-master.pp @@ -1,6 +1,6 @@ -class zulip::postgres-master { - class { 'zulip::base': } - class { 'zulip::postgres-appdb': } +class zulip-internal::postgres-master { + class { 'zulip-internal::base': } + class { 'zulip-internal::postgres-appdb': } $master_packages = [ "xfsprogs", "mdadm", ] package { $master_packages: ensure => "installed" } @@ -15,7 +15,7 @@ class zulip::postgres-master { owner => 'root', group => 'root', mode => 644, - source => 'puppet:///modules/zulip/postgresql/40-postgresql.conf.master', + source => 'puppet:///modules/zulip-internal/postgresql/40-postgresql.conf.master', } file { "/etc/postgresql/9.1/main/postgresql.conf": @@ -24,7 +24,7 @@ class zulip::postgres-master { owner => "postgres", group => "postgres", mode => 644, - source => "puppet:///modules/zulip/postgresql/postgresql.conf.master", + source => "puppet:///modules/zulip-internal/postgresql/postgresql.conf.master", } file { "/root/setup_disks.sh": @@ -32,7 +32,7 @@ class zulip::postgres-master { owner => 'root', group => 'root', mode => 744, - source => 'puppet:///modules/zulip/postgresql/setup_disks.sh', + source => 'puppet:///modules/zulip-internal/postgresql/setup_disks.sh', } exec { "setup_disks": diff --git a/servers/puppet/modules/zulip/manifests/postgres-slave.pp b/servers/puppet/modules/zulip-internal/manifests/postgres-slave.pp similarity index 61% rename from servers/puppet/modules/zulip/manifests/postgres-slave.pp rename to servers/puppet/modules/zulip-internal/manifests/postgres-slave.pp index f18180db43..b713d8603a 100644 --- a/servers/puppet/modules/zulip/manifests/postgres-slave.pp +++ b/servers/puppet/modules/zulip-internal/manifests/postgres-slave.pp @@ -1,6 +1,6 @@ -class zulip::postgres-slave { - class { 'zulip::base': } - class { 'zulip::postgres-appdb': } +class zulip-internal::postgres-slave { + class { 'zulip-internal::base': } + class { 'zulip-internal::postgres-appdb': } # We bundle a bunch of other sysctl parameters into 40-postgresql.conf file { '/etc/sysctl.d/30-postgresql-shm.conf': @@ -12,7 +12,7 @@ class zulip::postgres-slave { owner => 'root', group => 'root', mode => 644, - source => 'puppet:///modules/zulip/postgresql/40-postgresql.conf.slave', + source => 'puppet:///modules/zulip-internal/postgresql/40-postgresql.conf.slave', } file { "/etc/postgresql/9.1/main/postgresql.conf": @@ -21,6 +21,6 @@ class zulip::postgres-slave { owner => "postgres", group => "postgres", mode => 644, - source => "puppet:///modules/zulip/postgresql/postgresql.conf.slave", + source => "puppet:///modules/zulip-internal/postgresql/postgresql.conf.slave", } } diff --git a/servers/puppet/modules/zulip/manifests/prod_app_frontend.pp b/servers/puppet/modules/zulip-internal/manifests/prod_app_frontend.pp similarity index 75% rename from servers/puppet/modules/zulip/manifests/prod_app_frontend.pp rename to servers/puppet/modules/zulip-internal/manifests/prod_app_frontend.pp index d66fff920e..47939b070e 100644 --- a/servers/puppet/modules/zulip/manifests/prod_app_frontend.pp +++ b/servers/puppet/modules/zulip-internal/manifests/prod_app_frontend.pp @@ -1,5 +1,5 @@ -class zulip::prod_app_frontend { - class { 'zulip::base': } +class zulip-internal::prod_app_frontend { + class { 'zulip-internal::base': } class { 'zulip::app_frontend': } file { "/etc/nginx/sites-available/zulip": @@ -8,7 +8,7 @@ class zulip::prod_app_frontend { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/nginx/sites-available/zulip", + source => "puppet:///modules/zulip-internal/nginx/sites-available/zulip", } file { '/etc/nginx/sites-enabled/zulip': ensure => 'link', @@ -30,7 +30,7 @@ class zulip::prod_app_frontend { owner => "zulip", group => "zulip", mode => 644, - source => "puppet:///modules/zulip/sparkle/mac/sparkle.xml", + source => "puppet:///modules/zulip-internal/sparkle/mac/sparkle.xml", } file { "/srv/www/dist/apps/mac/sparkle-changelog.html": ensure => file, @@ -38,7 +38,7 @@ class zulip::prod_app_frontend { owner => "zulip", group => "zulip", mode => 644, - source => "puppet:///modules/zulip/sparkle/mac/sparkle-changelog.html", + source => "puppet:///modules/zulip-internal/sparkle/mac/sparkle-changelog.html", } file { "/srv/www/dist/apps/win/sparkle.xml": ensure => file, @@ -46,7 +46,7 @@ class zulip::prod_app_frontend { owner => "zulip", group => "zulip", mode => 644, - source => "puppet:///modules/zulip/sparkle/win/sparkle.xml", + source => "puppet:///modules/zulip-internal/sparkle/win/sparkle.xml", } file { "/srv/www/dist/apps/win/sparkle-changelog.html": ensure => file, @@ -54,7 +54,7 @@ class zulip::prod_app_frontend { owner => "zulip", group => "zulip", mode => 644, - source => "puppet:///modules/zulip/sparkle/win/sparkle-changelog.html", + source => "puppet:///modules/zulip-internal/sparkle/win/sparkle-changelog.html", } # Prod has our Apple Push Notifications Service private key at # /etc/ssl/django-private/apns-dist.pem diff --git a/servers/puppet/modules/zulip/manifests/staging_app_frontend.pp b/servers/puppet/modules/zulip-internal/manifests/staging_app_frontend.pp similarity index 70% rename from servers/puppet/modules/zulip/manifests/staging_app_frontend.pp rename to servers/puppet/modules/zulip-internal/manifests/staging_app_frontend.pp index d8e5e8c55b..513ca160f7 100644 --- a/servers/puppet/modules/zulip/manifests/staging_app_frontend.pp +++ b/servers/puppet/modules/zulip-internal/manifests/staging_app_frontend.pp @@ -1,5 +1,5 @@ -class zulip::staging_app_frontend { - class { 'zulip::base': } +class zulip-internal::staging_app_frontend { + class { 'zulip-internal::base': } class { 'zulip::app_frontend': } $packages = [ "python-html2text" ] @@ -11,7 +11,7 @@ class zulip::staging_app_frontend { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/nginx/sites-available/zulip-staging", + source => "puppet:///modules/zulip-internal/nginx/sites-available/zulip-staging", } file { '/etc/nginx/sites-enabled/zulip-staging': ensure => 'link', @@ -22,21 +22,21 @@ class zulip::staging_app_frontend { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/cron.d/email-mirror", + source => "puppet:///modules/zulip-internal/cron.d/email-mirror", } file { "/etc/cron.d/active-user-stats": ensure => file, owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/cron.d/active-user-stats", + source => "puppet:///modules/zulip-internal/cron.d/active-user-stats", } file { "/etc/cron.d/clearsessions": ensure => file, owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/cron.d/clearsessions", + source => "puppet:///modules/zulip-internal/cron.d/clearsessions", } # Staging has our Apple Push Notifications Service private key at # /etc/ssl/django-private/apns-dev.pem diff --git a/servers/puppet/modules/zulip/manifests/stats.pp b/servers/puppet/modules/zulip-internal/manifests/stats.pp similarity index 73% rename from servers/puppet/modules/zulip/manifests/stats.pp rename to servers/puppet/modules/zulip-internal/manifests/stats.pp index 64591e9005..a755a5cd8c 100644 --- a/servers/puppet/modules/zulip/manifests/stats.pp +++ b/servers/puppet/modules/zulip-internal/manifests/stats.pp @@ -1,6 +1,6 @@ -class zulip::stats { - class { 'zulip::base': } - class { 'zulip::apache': } +class zulip-internal::stats { + class { 'zulip-internal::base': } + class { 'zulip-internal::apache': } class { 'zulip::supervisor': } $stats_packages = [ "libssl-dev", "zlib1g-dev", "python-twisted", "python-django", "python-django-tagging", @@ -12,14 +12,14 @@ class zulip::stats { owner => 'root', group => 'root', mode => 744, - source => 'puppet:///modules/zulip/graphite/setup_disks.sh', + source => 'puppet:///modules/zulip-internal/graphite/setup_disks.sh', } file { "/etc/cron.d/graphite_backup": ensure => file, owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/cron.d/graphite_backup", + source => "puppet:///modules/zulip-internal/cron.d/graphite_backup", } exec { "setup_disks": command => "/root/setup_disks.sh", @@ -40,42 +40,42 @@ class zulip::stats { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/graphite/carbon.conf", + source => "puppet:///modules/zulip-internal/graphite/carbon.conf", } file { "/opt/graphite/conf/aggregation-rules.conf": ensure => file, owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/graphite/aggregation-rules.conf", + source => "puppet:///modules/zulip-internal/graphite/aggregation-rules.conf", } file { "/opt/graphite/conf/storage-aggregation.conf": ensure => file, owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/graphite/storage-aggregation.conf", + source => "puppet:///modules/zulip-internal/graphite/storage-aggregation.conf", } file { "/opt/graphite/conf/storage-schemas.conf": ensure => file, owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/graphite/storage-schemas.conf", + source => "puppet:///modules/zulip-internal/graphite/storage-schemas.conf", } file { "/opt/graphite/webapp/graphite/local_settings.py": ensure => file, owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/graphite/local_settings.py", + source => "puppet:///modules/zulip-internal/graphite/local_settings.py", } file { "/opt/graphite/conf/graphite.wsgi": ensure => file, owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/graphite/graphite.wsgi", + source => "puppet:///modules/zulip-internal/graphite/graphite.wsgi", } file { "/home/zulip/graphiti/config/settings.yml": @@ -83,7 +83,7 @@ class zulip::stats { owner => "zulip", group => "zulip", mode => 644, - source => "puppet:///modules/zulip/graphiti/settings.yml", + source => "puppet:///modules/zulip-internal/graphiti/settings.yml", } apache2site { 'graphite': @@ -105,7 +105,7 @@ class zulip::stats { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/statsd/redis.conf", + source => "puppet:///modules/zulip-internal/statsd/redis.conf", } service { 'redis-server': ensure => running, @@ -117,6 +117,6 @@ class zulip::stats { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/supervisor/conf.d/stats.conf", + source => "puppet:///modules/zulip-internal/supervisor/conf.d/stats.conf", } } diff --git a/servers/puppet/modules/zulip/manifests/trac.pp b/servers/puppet/modules/zulip-internal/manifests/trac.pp similarity index 73% rename from servers/puppet/modules/zulip/manifests/trac.pp rename to servers/puppet/modules/zulip-internal/manifests/trac.pp index 280bdb242d..7323d8685e 100644 --- a/servers/puppet/modules/zulip/manifests/trac.pp +++ b/servers/puppet/modules/zulip-internal/manifests/trac.pp @@ -1,7 +1,7 @@ -class zulip::trac { - class { 'zulip::base': } - class { 'zulip::apache': } - class { 'zulip::mediawiki': } +class zulip-internal::trac { + class { 'zulip-internal::base': } + class { 'zulip-internal::apache': } + class { 'zulip-internal::mediawiki': } $trac_packages = [ "trac", ] package { $trac_packages: ensure => "installed" } @@ -16,7 +16,7 @@ class zulip::trac { owner => "zulip", group => "zulip", mode => 644, - source => "puppet:///modules/zulip/trac.ini", + source => "puppet:///modules/zulip-internal/trac.ini", require => User['zulip'], } file { "/home/zulip/trac/cgi-bin/": @@ -24,7 +24,7 @@ class zulip::trac { owner => "zulip", group => "zulip", mode => 644, - source => "puppet:///modules/zulip/trac/cgi-bin/", + source => "puppet:///modules/zulip-internal/trac/cgi-bin/", } file { '/home/zulip/trac/plugins/zulip_trac.py': ensure => 'link', @@ -41,7 +41,7 @@ class zulip::trac { owner => 'root', group => 'root', mode => 644, - source => 'puppet:///modules/zulip/postgresql/40-postgresql.conf.trac', + source => 'puppet:///modules/zulip-internal/postgresql/40-postgresql.conf.trac', } file { "/etc/postgresql/9.1/main/postgresql.conf": @@ -50,6 +50,6 @@ class zulip::trac { owner => "postgres", group => "postgres", mode => 644, - source => "puppet:///modules/zulip/postgresql/postgresql.conf.trac", + source => "puppet:///modules/zulip-internal/postgresql/postgresql.conf.trac", } } diff --git a/servers/puppet/modules/zulip/manifests/zmirror.pp b/servers/puppet/modules/zulip-internal/manifests/zmirror.pp similarity index 76% rename from servers/puppet/modules/zulip/manifests/zmirror.pp rename to servers/puppet/modules/zulip-internal/manifests/zmirror.pp index 3351f64867..ab10b16050 100644 --- a/servers/puppet/modules/zulip/manifests/zmirror.pp +++ b/servers/puppet/modules/zulip-internal/manifests/zmirror.pp @@ -1,5 +1,5 @@ -class zulip::zmirror { - class { 'zulip::base': } +class zulip-internal::zmirror { + class { 'zulip-internal::base': } class { 'zulip::supervisor': } $zmirror_packages = [ "cython", "libzephyr-dev", "comerr-dev", "python-dev", "libzephyr4-krb5", "zephyr-clients", @@ -11,7 +11,7 @@ class zulip::zmirror { mode => 644, owner => "root", group => "root", - source => 'puppet:///modules/zulip/debathena.list', + source => 'puppet:///modules/zulip-internal/debathena.list', } file { "/etc/supervisor/conf.d/zmirror.conf": require => Package[supervisor], @@ -19,7 +19,7 @@ class zulip::zmirror { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/supervisor/conf.d/zmirror.conf", + source => "puppet:///modules/zulip-internal/supervisor/conf.d/zmirror.conf", notify => Service["supervisor"], } @@ -28,7 +28,7 @@ class zulip::zmirror { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/cron.d/zephyr-mirror", + source => "puppet:///modules/zulip-internal/cron.d/zephyr-mirror", } file { "/etc/defaults/zephyr-clients.debathena": @@ -36,7 +36,7 @@ class zulip::zmirror { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/zephyr-clients.debathena", + source => "puppet:///modules/zulip-internal/zephyr-clients.debathena", } # TODO: Do the rest of our setup, which includes at least: diff --git a/servers/puppet/modules/zulip/manifests/zmirror_personals.pp b/servers/puppet/modules/zulip-internal/manifests/zmirror_personals.pp similarity index 84% rename from servers/puppet/modules/zulip/manifests/zmirror_personals.pp rename to servers/puppet/modules/zulip-internal/manifests/zmirror_personals.pp index 4f0542af19..b8293a8d05 100644 --- a/servers/puppet/modules/zulip/manifests/zmirror_personals.pp +++ b/servers/puppet/modules/zulip-internal/manifests/zmirror_personals.pp @@ -1,5 +1,5 @@ -class zulip::zmirror_personals { - class { 'zulip::base': } +class zulip-internal::zmirror_personals { + class { 'zulip-internal::base': } class { 'zulip::supervisor': } $zmirror_packages = [ "cython", "libzephyr-dev", "comerr-dev", "python-dev", "libzephyr4-krb5", "zephyr-clients", @@ -11,7 +11,7 @@ class zulip::zmirror_personals { mode => 644, owner => "root", group => "root", - source => 'puppet:///modules/zulip/debathena.list', + source => 'puppet:///modules/zulip-internal/debathena.list', } file { ['/home/zulip/api-keys', '/home/zulip/zephyr_sessions', '/home/zulip/ccache', '/home/zulip/mirror_status']: @@ -26,7 +26,7 @@ class zulip::zmirror_personals { owner => "root", group => "root", mode => 644, - source => "puppet:///modules/zulip/cron.d/test_zephyr_personal_mirrors", + source => "puppet:///modules/zulip-internal/cron.d/test_zephyr_personal_mirrors", } # TODO: Do the rest of our setup, which includes at least: diff --git a/servers/puppet/modules/zulip/files/cron.d/graphite_backup b/servers/puppet/modules/zulip/files/cron.d/graphite_backup deleted file mode 100644 index 70ca2675f8..0000000000 --- a/servers/puppet/modules/zulip/files/cron.d/graphite_backup +++ /dev/null @@ -1,4 +0,0 @@ -MAILTO=root -SHELL=/bin/bash - -0 3 * * * zulip /home/zulip/zulip/servers/puppet/modules/zulip/files/graphite/daily_rsync_backup.sh diff --git a/servers/puppet/modules/zulip/manifests/base.pp b/servers/puppet/modules/zulip/manifests/base.pp index b574ef5e41..23212e2274 100644 --- a/servers/puppet/modules/zulip/manifests/base.pp +++ b/servers/puppet/modules/zulip/manifests/base.pp @@ -1,17 +1,16 @@ class zulip::base { - $packages = [ "screen", "strace", "vim", "emacs23-nox", "git", "python-tz", - "sqlite3", "ntp", "python-simplejson", "host", - "openssh-server", "python-pip", "puppet-el", "mosh", - "iptables-persistent", "nagios-plugins-basic", "munin-node", - "munin-plugins-extra", "postgresql-client-9.1", "molly-guard", - "debian-goodies", "moreutils", "python-requests", "ipython", - "python-boto", "python-netifaces" ] - package { $packages: ensure => "installed" } - + $base_packages = [ "screen", "strace", "vim", "emacs23-nox", "git", "python-tz", + "sqlite3", "ntp", "python-simplejson", "host", + "openssh-server", "python-pip", "puppet-el", "mosh", + "iptables-persistent", "postgresql-client-9.1", "molly-guard", + "debian-goodies", "moreutils", "python-requests", "ipython", + "python-boto", "python-netifaces" ] + package { $base_packages: ensure => "installed" } apt::key {"A529EF65": source => "http://apt.zulip.com/ops.asc", } + apt::sources_list {"zulip": ensure => present, content => 'deb http://apt.zulip.com/ops wheezy main', @@ -30,37 +29,6 @@ class zulip::base { home => '/home/zulip', managehome => true, } - file { '/home/zulip/.ssh/authorized_keys': - ensure => file, - require => File['/home/zulip/.ssh'], - mode => 600, - owner => "zulip", - group => "zulip", - source => 'puppet:///modules/zulip/authorized_keys', - } - file { '/home/zulip/.ssh': - ensure => directory, - require => User['zulip'], - owner => "zulip", - group => "zulip", - mode => 600, - } - - file { '/root/.ssh/authorized_keys': - ensure => file, - mode => 600, - owner => "root", - group => "root", - source => 'puppet:///modules/zulip/root_authorized_keys', - } - - # This is just an empty file. It's used by the app to test if it's running - # in production. - file { '/etc/zulip/server': - ensure => file, - mode => 644, - content => '', - } file { '/etc/zulip': ensure => 'directory', @@ -89,18 +57,6 @@ class zulip::base { source => 'puppet:///modules/zulip/apt/apt.conf.d/02periodic', } - file { '/usr/local/sbin/zulip-ec2-configure-interfaces': - ensure => file, - mode => 755, - source => 'puppet:///modules/zulip/zulip-ec2-configure-interfaces', - } - - file { '/etc/network/if-up.d/zulip-ec2-configure-interfaces_if-up.d.sh': - ensure => file, - mode => 755, - source => 'puppet:///modules/zulip/zulip-ec2-configure-interfaces_if-up.d.sh', - } - file { '/etc/ssh/sshd_config': require => Package['openssh-server'], ensure => file, @@ -129,62 +85,6 @@ class zulip::base { mode => 640, } - group { 'nagios': - ensure => present, - gid => '1050', - } - user { 'nagios': - ensure => present, - uid => '1050', - gid => '1050', - shell => '/bin/bash', - home => '/var/lib/nagios', - managehome => true, - } - file { '/var/lib/nagios/': - ensure => directory, - require => User['nagios'], - owner => "nagios", - group => "nagios", - mode => 600, - } - file { '/var/lib/nagios_state/': - ensure => directory, - require => User['nagios'], - owner => "nagios", - group => "nagios", - mode => 777, - } - file { '/var/lib/nagios/.ssh': - ensure => directory, - require => File['/var/lib/nagios/'], - owner => "nagios", - group => "nagios", - mode => 600, - } - file { '/var/lib/nagios/.ssh/authorized_keys': - ensure => file, - require => File['/var/lib/nagios/.ssh'], - mode => 600, - owner => "nagios", - group => "nagios", - source => 'puppet:///modules/zulip/nagios_authorized_keys', - } - file { '/home/nagios': - ensure => absent, - force => true, - recurse => true, - } - file { "/usr/lib/nagios/plugins/": - require => Package[nagios-plugins-basic], - recurse => true, - purge => false, - owner => "root", - group => "root", - mode => 755, - source => "puppet:///modules/zulip/nagios_plugins/", - } - file { '/etc/iptables/rules': ensure => file, mode => 600, diff --git a/servers/puppet/modules/zulip/manifests/nginx.pp b/servers/puppet/modules/zulip/manifests/nginx.pp index e44db45a9e..ed8c4ab49b 100644 --- a/servers/puppet/modules/zulip/manifests/nginx.pp +++ b/servers/puppet/modules/zulip/manifests/nginx.pp @@ -1,4 +1,3 @@ -# For any system using nginx (currently just app frontends and load balancers) class zulip::nginx { $web_packages = [ "nginx", ] package { $web_packages: ensure => "installed" }