Tim Abbott 259dca9508 puppet: Merge the ports.conf into zulip-sso.example. ... This makes us not blow away a customer's ports.conf configuration on upgrade if they needed to change it while setting up their SSO. Also we change the NameVirtualHost line to better match the VirtualHost line. (imported from commit fd52e00c35afa8982e0377859ad794085ec2af80)		2013-11-15 18:13:09 -05:00
..
puppet-apt	puppet-apt: Fix missing owner/group for created files.	2013-11-13 21:47:14 -05:00
puppet-common	[manual] Move puppet modules to the top level	2013-10-30 15:42:26 -04:00
zulip	puppet: Merge the ports.conf into zulip-sso.example.	2013-11-15 18:13:09 -05:00
zulip_internal	Clean up our nginx configuraiton to make better use of app.d.	2013-11-15 15:04:13 -05:00
apt	[manual] Move puppet modules to the top level	2013-10-30 15:42:26 -04:00
common	[manual] Move puppet modules to the top level	2013-10-30 15:42:26 -04:00