Commit Graph

56 Commits

Author SHA1 Message Date
Tim Abbott 9748780192 Remove unnecessary puppet.conf configuration.
Fixes #23.
2015-09-26 21:34:19 -07:00
Tim Abbott c38bad0b65 zulip-puppet-apply: Fix the force option handling.
(imported from commit e3a0f3902ac183c7c30ba0e8ed27e7bd9924ff2b)
2013-11-05 17:06:31 -05:00
Zev Benjamin b3e6d49d2f puppet: Switch puppet to using include-style class declarations
This allows us to declare classes more than once, which we need as
we're making our class dependency graph more complicated.  See
http://docs.puppetlabs.com/puppet/2.7/reference/lang_classes.html#aside-history-the-future-and-best-practices

(imported from commit d4199b0df0d92d166fbc3559957f67ee9cf2ecdc)
2013-11-05 14:14:19 -05:00
Zev Benjamin 787215d743 [manual] Switch over to new /etc/zulip/zulip.conf config file
Run the following commands as root before deploying this branch:
 # /root/zulip/tools/migrate-server-config
 # rm /etc/zulip/machinetype /etc/zulip/server /etc/zulip/local /etc/humbug-machinetype /etc/humbug-server /etc/humbug-local

(imported from commit aa7dcc50d2f4792ce33834f14761e76512fca252)
2013-11-05 14:14:19 -05:00
Zev Benjamin 8ca76ba13f 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)
2013-10-30 15:42:25 -04:00
Tim Abbott 7c6ca81df5 Move zulip-puppet-apply to scripts/.
(imported from commit c4e4c98f0a50feb31f7a716e04009d814cf047e7)
2013-10-28 10:54:48 -04:00