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)
This commit is contained in:
Zev Benjamin 2013-10-29 18:53:04 -04:00
parent 57bef07832
commit 8ca76ba13f
130 changed files with 214 additions and 209 deletions

View File

@ -10,10 +10,10 @@ if len(extra_args) and extra_args[0] in ('-f', '--force'):
force = True force = True
eatra_args = extra_args[1:] eatra_args = extra_args[1:]
with open('/etc/humbug-machinetype') as f: with open('/etc/zulip/machinetype') as f:
machinetype = f.readline().strip() 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 puppet_cmd += extra_args
if force: if force:

View File

@ -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

Some files were not shown because too many files have changed in this diff Show More